Merge branch 'develop'

plfiorini · plfiorini · commit b1b7cfdd66ae · 2018-03-24T13:06:52.000+01:00
diff --git 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
@@ -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 = \
     "<!-- begin headerstyles -->\n" \
@@ -19,23 +23,22 @@ HTML.headerstyles = \
     "<!-- end headerstyles -->\n" \
 
 HTML.headerscripts = \
-    "  <script defer type=\"text/javascript\" src=\"https://code.jquery.com/jquery-3.2.1.min.js\"></script>\n" \
     "  <script defer type=\"text/javascript\" src=\"https://code.getmdl.io/1.3.0/material.min.js\"></script>\n" \
 
 HTML.endheader = \
     "</head>\n"
 
 HTML.postheader = \
     "<!-- begin postheader -->\n" \
-    "<div style=\"display: none;\">\n" \
-    "<!-- end postheader -->\n" \
-
-HTML.postpostheader = \
-    "<!-- begin postpostheader -->\n" \
-    "</div>\n" \
     "<body class=\"mdl-demo mdl-color--grey-100 mdl-color-text--grey-700 mdl-base\">\n" \
     "  <div class=\"liri-layout mdl-layout mdl-js-layout mdl-layout--fixed-header\">\n" \
     "    <header class=\"mdl-layout__header mdl-layout__header--scroll\">\n" \
+    "      <div class=\"mdl-layout__header-row\">\n" \
+    "        <i class=\"icon-liri liri-bird pointer\" onclick=\"location.href='index.html'\"></i>\n" \
+    "        <span class=\"mdl-layout-title pointer mdl-layout--large-screen-only\"" \
+    "              onclick=\"location.href='/'\">Liri</span>\n" \
+    "        <span class=\"mdl-layout-title mdl-layout--small-screen-only\">Fluid API</span>\n" \
+    "      </div>\n" \
     "    </header>\n" \
     "    <div class=\"liri-ribbon mdl-color--primary\"></div>\n" \
     "    <main class=\"liri-main mdl-layout__content\">\n" \
@@ -44,6 +47,12 @@ HTML.postpostheader = \
     "        <div class=\"liri-content mdl-color--white mdl-shadow--4dp content mdl-color-text--grey-800 mdl-cell mdl-cell--8-col pt32\">\n" \
     "          <a name=\"top\"></a>\n" \
     "          <div class=\"container\">\n" \
+    "            <ul class=\"navigationbar\">\n" \
+    "<!-- end postheader -->\n" \
+
+HTML.postpostheader = \
+    "<!-- begin postpostheader -->\n" \
+    "            </ul>\n" \
     "<!-- end postpostheader -->\n" \
 
 HTML.prologue = ""
diff --git 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
@@ -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/tarball.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

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,10 @@ import qbs 1.0`
`2`	`2`
`3`	`3`	`Project {`
`4`	`4`	`name: "Deployment"`
`5`		`- condition: project.deploymentEnabled`
`6`	`5`
`7`	`6`	`references: [`
`8`	`7`	`"windows.qbs",`
`9`		`- "linux.qbs",`
	`8`	`+ "tarball.qbs",`
`10`	`9`	`"module.qbs",`
`11`	`10`	`]`
`12`	`11`	`}`