Merge remote-tracking branch 'origin/5.6' into 5.7

* origin/5.6:
  Doc: Remove generic Device Creation documentation

Conflicts:
	src/doc/config/b2qt-project.qdocconf
	src/doc/src/devices/qtee-bd-sl-imx6.qdoc
	src/doc/src/devices/qtee-beaglebone-black.qdoc
	src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc
	src/doc/src/devices/qtee-raspberry-pi.qdoc
	src/doc/src/devices/qtee-sabre-sd-imx6.qdoc
	src/doc/src/devices/qtee-supported-devices.qdoc
	src/doc/src/devices/qtee-toradex-apalis.qdoc
	src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc
	src/doc/src/devices/qtee-toradex-colibri-vf.qdoc
	src/doc/src/qtee-changelog.qdoc
	src/doc/src/qtee-custom-embedded-linux.qdoc
	src/doc/src/qtee-index.qdoc
	src/doc/src/qtee-static-linking.qdoc
	src/doc/src/shared/detect-sd-card-device-name.qdocinc

Change-Id: I52b87c5c383c6419a35d06cb2a0c87073c9d3c85

7 files changed, 32 insertions, 54 deletions

diff --git a/src/doc/config/b2qt-online.qdocconf b/src/doc/config/b2qt-online.qdocconf
deleted file mode 100644
index 901d1c1..0000000
--- a/src/doc/config/b2qt-online.qdocconf
+++ /dev/null
@@ -1,11 +0,0 @@
-include($QT_INSTALL_DOCS/global/qt-module-defaults-online-commercial.qdocconf)
-include(b2qt-project.qdocconf)
-
-# sidebar used for online template
-HTML.stylesheets += style/qt5-sidebar.html
-
-# Add definition for a custom note, shown on index.html when
-# the URL query string matches 'welcome'
-macro.welcome.HTML        = "<p class=\"welcome\" style=\"display:none;padding:6px;border:2px #e33 solid\"><i><b>Note:</b> This documentation is for the latest release of Qt for Device Creation. If you're using an older version, refer to the documentation in <b>Qt Creator</b>  &gt; <b>Help</b> instead.</i></p>\n"
-
-HTML.headerscripts += "  <script type=\"text/javascript\">\$(function(){if (document.location.search.substr(1) == \"welcome\") \$('.welcome').show();})</script>\n"
diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf
deleted file mode 100644
index f7c8df0..0000000
--- a/src/doc/config/b2qt.qdocconf
+++ /dev/null
@@ -1,2 +0,0 @@
-include(html-offline.qdocconf)
-include(b2qt-project.qdocconf)
diff --git a/src/doc/config/html-offline.qdocconf b/src/doc/config/html-offline.qdocconf
index fb06277..f9c92b7 100644
--- a/src/doc/config/html-offline.qdocconf
+++ b/src/doc/config/html-offline.qdocconf
@@ -15,15 +15,15 @@ HTML.footer = \
     "</div> \n" \
     "<div class=\"footer\">\n" \
     "    <p>\n" \
-    "      <acronym title=\"Copyright\">&copy;</acronym> 2015 The Qt Company.</p>\n" \
+    "      <acronym title=\"Copyright\">&copy;</acronym> 2016 The Qt Company Ltd.</p>\n" \
     "    <p>\n" \
-    "       Licensees holding valid Qt Commercial licenses may use this document in\n" \
-    "       accordance with the Qt Commercial License Agreement provided with the\n" \
+    "       Licensees holding valid commercial Qt licenses may use this document in\n" \
+    "       accordance with the commercial license agreement provided with the\n" \
     "       Software or, alternatively, in accordance with the terms contained in a\n" \
     "       written agreement between you and The Qt Company.<\p>\n" \
     "    <p>\n" \
     "      Qt and respective logos are trademarks of The Qt Company \n" \
     "      in Finland and/or other countries worldwide. All other trademarks are property\n" \
     "      of their respective owners. <a title=\"Privacy Policy\"\n" \
-    "      href=\"http://www.qt.io/terms-conditions/#section-3\">Privacy Policy</a></p>\n" \
+    "      href=\"http://www.qt.io/terms-conditions/#section-2\">Privacy Policy</a></p>\n" \
     "</div>\n"
diff --git a/src/doc/config/qtdeviceutilities-online.qdocconf b/src/doc/config/qtdeviceutilities-online.qdocconf
new file mode 100644
index 0000000..59cac90
--- /dev/null
+++ b/src/doc/config/qtdeviceutilities-online.qdocconf
@@ -0,0 +1,5 @@
+include($QT_INSTALL_DOCS/global/qt-module-defaults-online-commercial.qdocconf)
+include(qtdeviceutilities-project.qdocconf)
+
+# sidebar used for online template
+HTML.stylesheets += style/qt5-sidebar.html
diff --git a/src/doc/config/b2qt-project.qdocconf b/src/doc/config/qtdeviceutilities-project.qdocconf
index fe4bc37..51f1567 100644
--- a/src/doc/config/b2qt-project.qdocconf
+++ b/src/doc/config/qtdeviceutilities-project.qdocconf
@@ -1,6 +1,6 @@
-project                      = QtForDeviceCreation
-description                  = Qt 5.7 for Device Creation
-version                      = 5.7.0
+project                      = QtDeviceUtilities
+description                  = Qt Device Utilities
+version                      = 5.6.2
 
 sourcedirs                  += ../src \
                                ../../imports/wifi \
@@ -18,26 +18,21 @@ indexes                      = $QT_INSTALL_DOCS/qtquick/qtquick.index \
                                $QT_INSTALL_DOCS/qtdoc/qtdoc.index \
                                $QT_INSTALL_DOCS/qtgui/qtgui.index \
                                $QT_INSTALL_DOCS/qtcore/qtcore.index \
-                               $QT_INSTALL_DOCS/qtserialport/qtserialport.index \
-                               $QT_INSTALL_DOCS/emulator/emulator.index \
-                               $QT_INSTALL_DOCS/qtwebengine/qtwebengine.index \
                                $QT_INSTALL_DOCS/qtquickcontrols/qtquickcontrols.index
 
-# Listing qmake.index as part of 'indexes' fails, add a dependency as workaround
-depends                      = qmake
+qhp.projects                 = QtDeviceUtilities
 
-qhp.projects                 = B2Qt
+qhp.QtDeviceUtilities.file                = qtdeviceutilities.qhp
+qhp.QtDeviceUtilities.namespace           = io.qt.qtdeviceutilities.562
+qhp.QtDeviceUtilities.virtualFolder       = qtdeviceutilities
+qhp.QtDeviceUtilities.indexTitle          = Qt for Device Creation: Add-On Modules
+qhp.QtDeviceUtilities.indexRoot           =
 
-qhp.B2Qt.file                = b2qt.qhp
-qhp.B2Qt.namespace           = com.digia.b2qt.570
-qhp.B2Qt.virtualFolder       = b2qt
-qhp.B2Qt.indexTitle          = Qt 5.7 for Device Creation
-qhp.B2Qt.indexRoot           =
-
-qhp.B2Qt.subprojects                   = manual
-qhp.B2Qt.subprojects.manual.title      = Qt 5.7 for Device Creation
-qhp.B2Qt.subprojects.manual.indexTitle = Qt 5.7 for Device Creation
-qhp.B2Qt.subprojects.manual.type       = manual
+qhp.QtDeviceUtilities.subprojects                    = modules
+qhp.QtDeviceUtilities.subprojects.modules.title      = Modules
+qhp.QtDeviceUtilities.subprojects.modules.indexTitle = Qt for Device Creation: Add-On Modules
+qhp.QtDeviceUtilities.subprojects.modules.selectors  = qmlmodule module
+qhp.QtDeviceUtilities.subprojects.modules.sortPages  = true
 
 macro.B2Q                    = "Boot to Qt"
 macro.SDK                    = "Qt for Device Creation"
@@ -45,7 +40,8 @@ macro.QAS                    = "Qt Automotive Suite"
 macro.B2QA                   = "\\e {Boot to Qt for embedded Android}"
 macro.B2QL                   = "\\e {Boot to Qt for embedded Linux}"
 
-navigation.landingpage       = "Qt 5.7 for Device Creation"
-navigation.qmltypespage      = "Add-On Modules"
+# Keep Device Creation as the landing page
+navigation.landingpage       = "Qt for Device Creation"
+navigation.qmltypespage      = "Qt for Device Creation: Add-On Modules"
 
 Cpp.ignoredirectives        += Q_DECLARE_LOGGING_CATEGORY
diff --git a/src/doc/config/qtdeviceutilities.qdocconf b/src/doc/config/qtdeviceutilities.qdocconf
new file mode 100644
index 0000000..9c56ed8
--- /dev/null
+++ b/src/doc/config/qtdeviceutilities.qdocconf
@@ -0,0 +1,2 @@
+include(html-offline.qdocconf)
+include(qtdeviceutilities-project.qdocconf)
diff --git a/src/doc/config/style/qt5-sidebar.html b/src/doc/config/style/qt5-sidebar.html
index 5f0660c..3879827 100644
--- a/src/doc/config/style/qt5-sidebar.html
+++ b/src/doc/config/style/qt5-sidebar.html
@@ -1,28 +1,16 @@
 <div class="sectionlist normallist">
     <div class="heading">
-        <h2>Qt for Device Creation</h2>
+        <h2>Qt Device Utilities</h2>
     </div>
     <ul>
-        <li><a href="index.html">Home</a></li>
-        <li><a href="qtee-overview.html">Overview</a></li>
-        <li><a href="qtee-about-b2qt.html">Boot to Qt</a></li>
-        <li><a href="qtee-installation-guide.html">Installation Guide</a></li>
-        <li><a href="qtee-supported-platforms.html">Supported Platforms</a></li>
-        <li><a href="qtee-preparing-hardware.html">Preparing Hardware</a></li>
-        <li><a href="qtee-building-and-running.html">Building and Running</a></li>
-        <li><a href="qtee-customization.html">Customization</a></li>
-        <li><a href="qtee-custom-embedded-linux-image.html">Custom Embedded Linux Images</a></li>
-        <li><a href="qtee-changelog.html">ChangeLog</a></li>
-        <li><a href="qtee-troubleshooting.html">Troubleshooting</a></li>
-        <li><a href="qtee-known-issues.html">Known Issues</a></li>
-        <li><a href="qtee-licenses.html">License Information</a></li>
+        <li><a href="qtee-module-reference.html">Home</a></li>
     </ul>
 </div>
 <div class="sectionlist normallist">
     <div class="heading">
-        <h2>Reference</h2>
+        <h2>See Also</h2>
     </div>
     <ul>
-        <li><a href="qtee-module-reference.html">Add-On Modules</a></li>
+        <li><a href="https://doc.qt.io/QtForDeviceCreation">Qt for Device Creation</a></li>
     </ul>
 </div>