From e8cd199f4a32bdc3492f8782c1f573ed312928ab Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Sat, 24 Mar 2018 12:33:08 +0100 Subject: [PATCH 1/5] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 20cf08fb..74daa303 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,11 @@ Qt >= 5.10.0 with at least the following modules is required: * [qtsvg](http://code.qt.io/cgit/qt/qtsvg.git) * [qtdoc](http://code.qt.io/cgit/qt/qtdoc.git) +The following modules and their dependencies are required: + + * [qbs >= 1.9.0](http://code.qt.io/cgit/qbs/qbs.git) + * [qbs-shared >= 1.2.0](https://github.com/lirios/qbs-shared.git) + ## Build Qbs is a new build system that is much easier to use compared to qmake or CMake. From 556a3f42eb3bd5640709f75e5574a39dce3dda71 Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Sat, 24 Mar 2018 12:38:43 +0100 Subject: [PATCH 2/5] Add Liri header to online docs --- doc/fluid-online.qdocconf | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/doc/fluid-online.qdocconf b/doc/fluid-online.qdocconf index 8819d61e..8331ca4f 100644 --- a/doc/fluid-online.qdocconf +++ b/doc/fluid-online.qdocconf @@ -1,13 +1,17 @@ include(config/fluid-project.qdocconf) -include($QT_INSTALL_DOCS/global/qt-html-templates-online.qdocconf) +include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) -HTML.nonavigationbar = "true" +HTML.nonavigationbar = "false" HTML.navigationseparator = "" HTML.stylesheets = \ template/style/base.css \ - template/style/liri.css + template/style/liri.css \ + template/style/liri.eot \ + template/style/liri.svg \ + template/style/liri.ttf \ + template/style/liri.woff HTML.headerstyles = \ "\n" \ @@ -19,7 +23,6 @@ HTML.headerstyles = \ "\n" \ HTML.headerscripts = \ - " \n" \ " \n" \ HTML.endheader = \ @@ -27,15 +30,15 @@ HTML.endheader = \ HTML.postheader = \ "\n" \ - "
\n" \ - "\n" \ - -HTML.postpostheader = \ - "\n" \ - "
\n" \ "\n" \ "
\n" \ "
\n" \ + "
\n" \ + " \n" \ + " Liri\n" \ + " Fluid API\n" \ + "
\n" \ "
\n" \ "
\n" \ "
\n" \ @@ -44,6 +47,12 @@ HTML.postpostheader = \ "
\n" \ " \n" \ "
\n" \ + "
    \n" \ + "\n" \ + +HTML.postpostheader = \ + "\n" \ + "
\n" \ "\n" \ HTML.prologue = "" From 49c781d7f4a4d0e5f5ed1ba6cb8e095b6541bc31 Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Sat, 24 Mar 2018 12:33:19 +0100 Subject: [PATCH 3/5] Bump version to 1.0.0 --- fluid.qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fluid.qbs b/fluid.qbs index 67607292..20bb1119 100644 --- a/fluid.qbs +++ b/fluid.qbs @@ -4,7 +4,7 @@ import qbs.Probes Project { name: "Fluid" - readonly property string version: "0.11.0" + readonly property string version: "1.0.0" readonly property var versionParts: version.split('.').map(function(part) { return parseInt(part); }) readonly property string minimumQtVersion: "5.10.0" From da9725671437f989eec5394a40c6e48e1d01b56d Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Sat, 24 Mar 2018 12:49:08 +0100 Subject: [PATCH 4/5] Always install Fluid.qbs --- src/deployment/deployment.qbs | 1 - src/deployment/linux.qbs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/deployment/deployment.qbs b/src/deployment/deployment.qbs index 1fd52a0b..86567321 100644 --- a/src/deployment/deployment.qbs +++ b/src/deployment/deployment.qbs @@ -2,7 +2,6 @@ import qbs 1.0 Project { name: "Deployment" - condition: project.deploymentEnabled references: [ "windows.qbs", diff --git a/src/deployment/linux.qbs b/src/deployment/linux.qbs index e4d4f5a8..445842be 100644 --- a/src/deployment/linux.qbs +++ b/src/deployment/linux.qbs @@ -3,7 +3,7 @@ import qbs 1.0 InstallPackage { name: "fluid-artifacts" targetName: name - builtByDefault: false + builtByDefault: project.deploymentEnabled archiver.type: "tar" archiver.outputDirectory: project.buildDirectory From 56d0a1c22e0fb63d6bed8c555c530d483408b255 Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Sat, 24 Mar 2018 12:50:01 +0100 Subject: [PATCH 5/5] Rename qbs file Tarball is a much more appropriate name. --- src/deployment/deployment.qbs | 2 +- src/deployment/{linux.qbs => tarball.qbs} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/deployment/{linux.qbs => tarball.qbs} (100%) diff --git a/src/deployment/deployment.qbs b/src/deployment/deployment.qbs index 86567321..2c28cde2 100644 --- a/src/deployment/deployment.qbs +++ b/src/deployment/deployment.qbs @@ -5,7 +5,7 @@ Project { references: [ "windows.qbs", - "linux.qbs", + "tarball.qbs", "module.qbs", ] } diff --git a/src/deployment/linux.qbs b/src/deployment/tarball.qbs similarity index 100% rename from src/deployment/linux.qbs rename to src/deployment/tarball.qbs