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. 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 = "" 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" diff --git a/src/deployment/deployment.qbs b/src/deployment/deployment.qbs index 1fd52a0b..2c28cde2 100644 --- a/src/deployment/deployment.qbs +++ b/src/deployment/deployment.qbs @@ -2,11 +2,10 @@ import qbs 1.0 Project { name: "Deployment" - condition: project.deploymentEnabled references: [ "windows.qbs", - "linux.qbs", + "tarball.qbs", "module.qbs", ] } diff --git a/src/deployment/linux.qbs b/src/deployment/tarball.qbs similarity index 90% rename from src/deployment/linux.qbs rename to src/deployment/tarball.qbs index e4d4f5a8..445842be 100644 --- a/src/deployment/linux.qbs +++ b/src/deployment/tarball.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