Merge remote-tracking branch 'origin/4.7'

Change-Id: I00b0009867322be55c215351054acc7de5b9e335

README.md

@@ -20,6 +20,7 @@ Prerequisites:
     * ActiveState Active Perl
     * MinGW with g++ 4.9 or Visual Studio 2015 or later
     * jom
+    * Python 3.5 or later (optional, needed for the python enabled debug helper)
 * On Mac OS X: latest Xcode
 * On Linux: g++ 4.9 or later
 * LLVM/Clang 6.0.0 or later (optional, needed for the Clang Code Model, see the
@@ -35,6 +36,8 @@ You can build Qt Creator with
     export LLVM_INSTALL_DIR=/path/to/llvm (or "set" on Windows)
     # Optional, needed to let the QbsProjectManager plugin use system Qbs:
     export QBS_INSTALL_DIR=/path/to/qbs
+    # Optional, needed for the Python enabled dumper on Windows
+    set PYTHON_INSTALL_DIR=C:\path\to\python
 
     cd $SOURCE_DIRECTORY
     qmake -r

dist/changes-4.7.0.md

@@ -103,6 +103,7 @@ Python Support
 Debugging
 
 * Fixed updating of memory view
+* Added `Leave Debug Mode` button to toolbar
 * QML
     * Added support for nested properties (QTBUG-68474)
     * Fixed issue with different endianness (QTBUG-68721)
@@ -148,6 +149,11 @@ Test Integration
     * Fixed parsing issue with non-ASCII characters (QTCREATORBUG-20105)
     * Fixed detection of test name (QTCREATORBUG-20642)
 
+Welcome
+
+* Rather than open project do nothing when right-clicking recent projects
+* Open session mini menu when right-clicking sessions
+
 Platform Specific
 
 Windows

doc/src/analyze/cpu-usage-analyzer.qdoc

@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-heob.html
     \page creator-cpu-usage-analyzer.html
     \nextpage creator-autotest.html

doc/src/analyze/creator-analyze.qdoc

@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-troubleshooting-debugging.html
     \page creator-analyze-mode.html
     \nextpage creator-qml-performance-monitor.html

doc/src/analyze/creator-clang-static-analyzer.qdoc

@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-running-valgrind-remotely.html
     \page creator-clang-tools.html
     \nextpage creator-heob.html

doc/src/analyze/creator-heob.qdoc

@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-clang-tools.html
     \page creator-heob.html
     \nextpage creator-cpu-usage-analyzer.html

doc/src/analyze/creator-valgrind-overview.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-qml-performance-monitor.html
     \page creator-valgrind-overview.html
     \nextpage creator-analyzer.html

doc/src/analyze/creator-valgrind.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-valgrind-overview.html
     \page creator-analyzer.html
     \nextpage creator-cache-profiler.html
@@ -140,7 +140,7 @@
 
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-analyzer.html
     \page creator-cache-profiler.html
     \nextpage creator-running-valgrind-remotely.html
@@ -260,7 +260,7 @@
 
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-cache-profiler.html
     \page creator-running-valgrind-remotely.html
     \nextpage creator-clang-tools.html

doc/src/analyze/qtquick-profiler.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-analyze-mode.html
     \page creator-qml-performance-monitor.html
     \nextpage creator-valgrind-overview.html

doc/src/android/androiddev.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -25,7 +25,7 @@
 
     /*!
 
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-connecting-mobile.html
     \page creator-developing-android.html
     \nextpage creator-developing-baremetal.html

doc/src/android/deploying-android.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -25,7 +25,7 @@
 
     /*!
 
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-deployment.html
     \page creator-deploying-android.html
     \nextpage creator-deployment-embedded-linux.html

doc/src/baremetal/creator-baremetal-dev.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -25,7 +25,7 @@
 
     /*!
 
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-developing-android.html
     \page creator-developing-baremetal.html
     \nextpage creator-developing-generic-linux.html

doc/src/cmake/creator-projects-cmake.qdoc

@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-project-other.html
     \page creator-project-cmake.html
     \nextpage creator-project-qbs.html

doc/src/debugger/creator-debugger-example.qdoc

@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-debugging-qml.html
     \page creator-debugging-example.html
     \nextpage creator-qml-debugging-example.html

doc/src/debugger/creator-debugger-setup.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -31,7 +31,7 @@
 
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-debugging.html
     \page creator-debugger-engines.html
     \nextpage creator-debugger-operating-modes.html

doc/src/debugger/creator-debugger.qdoc

@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-testing.html
     \page creator-debugging.html
     \nextpage creator-debugger-engines.html
@@ -98,7 +98,7 @@
 
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-debugger-engines.html
     \page creator-debugger-operating-modes.html
     \nextpage creator-debug-mode.html
@@ -352,7 +352,7 @@
 
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-debugger-operating-modes.html
     \page creator-debug-mode.html
     \nextpage creator-debugging-helpers.html
@@ -928,7 +928,7 @@
 
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-debug-mode.html
     \page creator-debugging-helpers.html
     \nextpage creator-debugging-qml.html
@@ -1526,7 +1526,7 @@
 
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-qml-debugging-example.html
     \page creator-troubleshooting-debugging.html
     \nextpage creator-analyze-mode.html

doc/src/debugger/qtquick-debugger-example.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-debugging-example.html
     \page creator-qml-debugging-example.html
     \nextpage creator-troubleshooting-debugging.html

doc/src/debugger/qtquick-debugging.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-debugging-helpers.html
     \page creator-debugging-qml.html
     \nextpage creator-debugging-example.html

doc/src/editors/creator-beautifier.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-editor-refactoring.html
     \page creator-beautifier.html
     \nextpage creator-editor-options.html

doc/src/editors/creator-clang-codemodel.qdoc

@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-diff-editor.html
     \page creator-clang-codemodel.html
     \nextpage creator-finding-overview.html

doc/src/editors/creator-coding-edit-mode.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-editor-functions.html
     \page creator-coding-navigating.html
     \nextpage creator-highlighting.html

doc/src/editors/creator-coding.qdoc

@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-usability.html
     \page creator-coding.html
     \nextpage creator-editor-functions.html

doc/src/editors/creator-diff-editor.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-macros.html
     \page creator-diff-editor.html
     \nextpage creator-clang-codemodel.html

doc/src/editors/creator-editors-options-text.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-editor-options.html
     \page creator-editor-options-text.html
     \nextpage creator-editor-fakevim.html

doc/src/editors/creator-editors-options.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-beautifier.html
     \page creator-editor-options.html
     \nextpage creator-editor-options-text.html

doc/src/editors/creator-editors-writing-code.qdoc

@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-coding.html
     \page creator-editor-functions.html
     \nextpage creator-coding-navigating.html

doc/src/editors/creator-editors.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-coding-navigating.html
     \page creator-highlighting.html
     \nextpage creator-checking-code-syntax.html
@@ -157,7 +157,7 @@
 
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-highlighting.html
     \page creator-checking-code-syntax.html
     \nextpage creator-completing-code.html
@@ -839,7 +839,7 @@
 
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-checking-code-syntax.html
     \page creator-completing-code.html
     \nextpage creator-indenting-code.html
@@ -1066,7 +1066,7 @@
 
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage qt-quick-toolbars.html
     \page creator-editor-codepasting.html
     \nextpage creator-macros.html
@@ -1159,7 +1159,7 @@
 
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-editor-codepasting.html
     \page creator-macros.html
     \nextpage creator-diff-editor.html
@@ -1196,7 +1196,7 @@
 
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-editor-options-text.html
     \page creator-editor-fakevim.html
     \nextpage creator-mime-types.html
@@ -1401,7 +1401,7 @@
     */
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-completing-code.html
     \page creator-indenting-code.html
     \nextpage qt-quick-toolbars.html
@@ -1668,7 +1668,7 @@
 
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-finding-overview.html
     \page creator-editor-finding.html
     \nextpage creator-editor-locator.html
@@ -1917,7 +1917,7 @@
 
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-editor-locator.html
     \page creator-editor-refactoring.html
     \nextpage creator-beautifier.html
@@ -2767,7 +2767,7 @@
 
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-editor-finding.html
     \page creator-editor-locator.html
     \nextpage creator-editor-refactoring.html

doc/src/editors/creator-finding.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-clang-codemodel.html
     \page creator-finding-overview.html
     \nextpage creator-editor-finding.html

doc/src/editors/creator-mime-types.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-editor-fakevim.html
     \page creator-mime-types.html
     \nextpage creator-modeling.html

doc/src/editors/creator-modeling.qdoc

@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-mime-types.html
     \page creator-modeling.html
     \nextpage creator-scxml.html

doc/src/editors/creator-scxml.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -44,7 +44,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-modeling.html
     \page creator-scxml.html
     \nextpage creator-building-running.html

doc/src/howto/creator-autotest.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -24,7 +24,7 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-cpu-usage-analyzer.html
     \page creator-autotest.html
     \nextpage creator-advanced.html

doc/src/howto/creator-cli.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-project-generic.html
     \page creator-cli.html
     \nextpage creator-keyboard-shortcuts.html

doc/src/howto/creator-external-tools.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-keyboard-shortcuts.html
     \page creator-editor-external.html
     \nextpage creator-task-lists.html

doc/src/howto/creator-help.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-help-overview.html
     \page creator-help.html
     \nextpage creator-faq.html

doc/src/howto/creator-keyboard-shortcuts.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-cli.html
     \page creator-keyboard-shortcuts.html
     \nextpage creator-editor-external.html

doc/src/howto/creator-sessions.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-sharing-project-settings.html
     \page creator-project-managing-sessions.html
     \nextpage creator-design-mode.html

doc/src/howto/creator-task-lists.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-editor-external.html
     \page creator-task-lists.html
     \nextpage creator-help-overview.html

doc/src/howto/creator-tips.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-faq.html
     \page creator-tips.html
     \nextpage creator-known-issues.html

doc/src/howto/creator-ui.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-overview.html
     \page creator-quick-tour.html
     \nextpage creator-configuring.html

doc/src/howto/qtcreator-faq.qdoc

@@ -24,7 +24,7 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-help.html
     \page creator-faq.html
     \nextpage creator-tips.html

doc/src/ios/creator-ios-dev.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -25,7 +25,7 @@
 
     /*!
 
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-developing-generic-linux.html
     \page creator-developing-ios.html
     \nextpage creator-developing-qnx.html

doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-deploying-android.html
     \page creator-deployment-embedded-linux.html
     \nextpage creator-deployment-qnx.html

doc/src/linux-mobile/linuxdev.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -25,7 +25,7 @@
 
     /*!
 
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-developing-baremetal.html
     \page creator-developing-generic-linux.html
     \nextpage creator-developing-ios.html

doc/src/overview/creator-acknowledgements.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage technical-support.html
     \page creator-acknowledgements.html
 

doc/src/overview/creator-advanced.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-autotest.html
     \page creator-advanced.html
     \nextpage creator-os-supported-platforms.html

doc/src/overview/creator-commercial-overview.qdoc

@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \page creator-commercial-overview.html
 
     \title Commercial Features

doc/src/overview/creator-configuring.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-quick-tour.html
     \page creator-configuring.html
     \nextpage creator-build-example-application.html

doc/src/overview/creator-deployment-overview.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-running-targets.html
     \page creator-deployment.html
     \nextpage creator-deploying-android.html

doc/src/overview/creator-design-overview.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-project-managing-sessions.html
     \page creator-design-mode.html
     \nextpage creator-visual-editor.html

doc/src/overview/creator-getting-started.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage index.html
     \page creator-getting-started.html
     \nextpage creator-overview.html

doc/src/overview/creator-glossary.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-known-issues.html
     \page creator-glossary.html
     \nextpage technical-support.html

doc/src/overview/creator-help-overview.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-task-lists.html
     \page creator-help-overview.html
     \nextpage creator-help.html

doc/src/overview/creator-issues.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-tips.html
     \page creator-known-issues.html
     \nextpage creator-glossary.html

doc/src/overview/creator-mobile-targets.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-deployment-qnx.html
     \page creator-connecting-mobile.html
     \nextpage creator-developing-android.html

doc/src/overview/creator-overview.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-getting-started.html
     \page creator-overview.html
     \nextpage creator-quick-tour.html

doc/src/overview/creator-supported-platforms.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -31,7 +31,7 @@
 
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-advanced.html
     \page creator-os-supported-platforms.html
     \nextpage creator-project-other.html

doc/src/overview/creator-tech-support.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-glossary.html
     \page technical-support.html
     \nextpage creator-acknowledgements.html

doc/src/overview/creator-testing.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-build-process-customizing.html
     \page creator-testing.html
     \nextpage creator-debugging.html

doc/src/overview/creator-tutorials.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-build-example-application.html
     \page creator-tutorials.html
     \nextpage {Creating a Qt Quick Application}

doc/src/overview/mobile-app-design.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage adding-plugins.html
     \page creator-usability.html
     \nextpage creator-coding.html

doc/src/projects/creator-projects-autotools.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Author: Peter Penz (ppenz@openismus.com)
 ** Auther: Patricia Santana Cruz (patriciasantanacruz@gmail.com)
 ** Contact: https://www.qt.io/licensing/
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-project-qbs.html
     \page creator-projects-autotools.html
     \nextpage creator-project-generic.html

doc/src/projects/creator-projects-build-run-tutorial.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-configuring.html
     \page creator-build-example-application.html
     \nextpage creator-tutorials.html

doc/src/projects/creator-projects-building-running.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-scxml.html
     \page creator-building-running.html
     \nextpage creator-building-targets.html

doc/src/projects/creator-projects-building.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-building-running.html
     \page creator-building-targets.html
     \nextpage creator-running-targets.html

doc/src/projects/creator-projects-builds-customizing.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-developing-qnx.html
     \page creator-build-process-customizing.html
     \nextpage creator-testing.html

doc/src/projects/creator-projects-compilers.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-project-qmake.html
     \page creator-tool-chains.html
     \nextpage creator-debuggers.html

doc/src/projects/creator-projects-creating.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-project-managing.html
     \page creator-project-creating.html
     \nextpage creator-project-opening.html

doc/src/projects/creator-projects-custom-wizards-json.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-project-wizards.html
     \page creator-project-wizards-json.html
     \nextpage creator-project-wizards-xml.html

doc/src/projects/creator-projects-custom-wizards-xml.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-project-wizards-json.html
     \page creator-project-wizards-xml.html
     \nextpage creator-version-control.html

doc/src/projects/creator-projects-custom-wizards.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-project-qmake-libraries.html
     \page creator-project-wizards.html
     \nextpage creator-project-wizards-json.html

doc/src/projects/creator-projects-debuggers.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-tool-chains.html
     \page creator-debuggers.html
     \nextpage creator-build-settings.html

doc/src/projects/creator-projects-generic.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-projects-autotools.html
     \page creator-project-generic.html
     \nextpage creator-cli.html

doc/src/projects/creator-projects-libraries.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-project-opening.html
     \page creator-project-qmake-libraries.html
     \nextpage creator-project-wizards.html

doc/src/projects/creator-projects-opening.qdoc

@@ -1,7 +1,7 @@
 
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -31,7 +31,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-project-creating.html
     \page creator-project-opening.html
     \nextpage creator-project-qmake-libraries.html

doc/src/projects/creator-projects-other.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-os-supported-platforms.html
     \page creator-project-other.html
     \nextpage creator-project-cmake.html

doc/src/projects/creator-projects-overview.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage accelbubble
     \page creator-project-managing.html
     \nextpage creator-project-creating.html

doc/src/projects/creator-projects-qbs.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -24,7 +24,7 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-project-cmake.html
     \page creator-project-qbs.html
     \nextpage creator-projects-autotools.html

doc/src/projects/creator-projects-qt-versions.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-targets.html
     \page creator-project-qmake.html
     \nextpage creator-tool-chains.html

doc/src/projects/creator-projects-running.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-building-targets.html
     \page creator-running-targets.html
     \nextpage creator-deployment.html

doc/src/projects/creator-projects-settings-build.qdoc

@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-debuggers.html
     \page creator-build-settings.html
     \nextpage creator-run-settings.html

doc/src/projects/creator-projects-settings-code-style.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-editor-settings.html
     \page creator-code-style-settings.html
     \nextpage creator-build-dependencies.html

doc/src/projects/creator-projects-settings-dependencies.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-code-style-settings.html
     \page creator-build-dependencies.html
     \nextpage creator-sharing-project-settings.html

doc/src/projects/creator-projects-settings-editor.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-run-settings.html
     \page creator-editor-settings.html
     \nextpage creator-code-style-settings.html

doc/src/projects/creator-projects-settings-overview.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-vcs-subversion.html
     \page creator-configuring-projects.html
     \nextpage creator-targets.html

doc/src/projects/creator-projects-settings-run.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-build-settings.html
     \page creator-run-settings.html
     \nextpage creator-editor-settings.html

doc/src/projects/creator-projects-settings-sharing.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-build-dependencies.html
     \page creator-sharing-project-settings.html
     \nextpage creator-project-managing-sessions.html

doc/src/projects/creator-projects-targets.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-configuring-projects.html
     \page creator-targets.html
     \nextpage creator-project-qmake.html

doc/src/qnx/creator-deployment-qnx.qdoc

@@ -2,7 +2,7 @@
 **
 ** This file is part of Qt Creator
 **
-** Copyright (C) 2016 Blackberry
+** Copyright (C) 2018 Blackberry
 **
 ** Contact: Blackberry (qt@blackberry.com)
 ** Contact: KDAB (info@kdab.com)
@@ -34,7 +34,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-deployment-embedded-linux.html
     \page creator-deployment-qnx.html
     \nextpage creator-connecting-mobile.html

doc/src/qnx/creator-developing-qnx.qdoc

@@ -2,7 +2,7 @@
 **
 ** This file is part of Qt Creator
 **
-** Copyright (C) 2016 Blackberry
+** Copyright (C) 2018 Blackberry
 **
 ** Contact: Blackberry (qt@blackberry.com)
 ** Contact: KDAB (info@kdab.com)
@@ -29,7 +29,7 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-developing-ios.html
     \page creator-developing-qnx.html
     \nextpage creator-build-process-customizing.html

doc/src/qtcreator-toc.qdoc

@@ -88,6 +88,13 @@
                 \li \l {Creating Qt Quick Projects}
                 \li \l {Qt Quick UI Forms}
                 \li \l {Editing QML Files in Design Mode}
+                \li \l {Creating Components}
+                    \list
+                        \li \l {Creating Buttons}
+                        \li \l {Creating Scalable Buttons and Borders}
+                    \endlist
+                \li \l {Managing Item Hierarchy}
+                \li \l {Specifying Item Properties}
                 \li \l {Editing PathView Properties}
                 \li \l {Adding Connections}
                 \list
@@ -97,10 +104,6 @@
                     \li \l{Managing C++ Backend Objects}
                 \endlist
                 \li \l {Adding States}
-                \li \l {Creating Components}
-                \li \l {Creating Buttons}
-                \li \l {Creating Scalable Buttons and Borders}
-                \li \l {Creating Screens}
                 \li \l {Browsing ISO 7000 Icons}
                 \li \l {Exporting Designs from Graphics Software}
                 \li \l {Using QML Modules with Plugins}

doc/src/qtquick/creator-mobile-app-tutorial.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-writing-program.html
     \example accelbubble
     \nextpage creator-project-managing.html

doc/src/qtquick/qtquick-app-development.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -31,7 +31,7 @@
 
 /*!
 
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-design-mode.html
     \page creator-visual-editor.html
     \nextpage quick-projects.html
@@ -56,6 +56,22 @@
             \uicontrol {Text Editor} in the Design mode to
             develop Qt Quick applications.
 
+        \li \l {Creating Components}
+
+            You can use basic QML types to create your own components that you
+            can combine with ready-made Qt Quick Controls 2 and Layouts
+            (available since Qt 5.7).
+
+        \li \l {Managing Item Hierarchy}
+
+            You can manage the items in the current QML file and their
+            relationships in the \uicontrol Navigator.
+
+        \li \l {Specifying Item Properties}
+
+            You can specify properties for your components in the
+            \uicontrol Properties pane.
+
         \li \l {Editing PathView Properties}
 
             You can use a graphical spline editor to specify \l{PathView} paths.
@@ -66,16 +82,11 @@
             You can connect objects to signals, specify dynamic properties for
             objects, and create bindings between the properties of two objects.
 
-        \li \l {Creating Components}
+        \li \l {Adding States}
 
-            You can use basic QML types to create your own components that you
+            You can use states to describe user interface configurations, such
-            can combine with ready-made Qt Quick Controls 2 and Layouts
+            as the UI controls, their properties and behavior, and the available
-            (available since Qt 5.7).
+            actions.
-        \li \l {Creating Screens}
-
-            You can combine basic QML types with ready-made Qt Quick Controls 2,
-            Dialogs, and Layouts (available since Qt 5.7) to create screens. You
-            can use states and transitions to navigate between screens.
 
         \li \l {Browsing ISO 7000 Icons}
 

doc/src/qtquick/qtquick-app-tutorial.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-tutorials.html
     \example transitions
     \nextpage creator-writing-program.html

doc/src/qtquick/qtquick-buttons.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,7 +30,7 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage quick-components.html
     \page quick-buttons.html
     \nextpage quick-scalable-image.html
@@ -115,10 +115,10 @@
 
 /*!
 
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage quick-buttons.html
     \page quick-scalable-image.html
-    \nextpage quick-screens.html
+    \nextpage qtquick-navigator.html
 
     \title Creating Scalable Buttons and Borders
 

doc/src/qtquick/qtquick-components.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,9 +30,8 @@
 // **********************************************************************
 
 /*!
-
+    \contentspage index.html
-    \contentspage {Qt Creator Manual}
+    \previouspage creator-using-qt-quick-designer.html
-    \previouspage quick-states.html
     \page quick-components.html
     \nextpage quick-buttons.html
 
@@ -42,43 +41,364 @@
     that you can re-use in other QML files. A component is like a black box; it
     interacts with the outside world through properties, signals, and slots, and
     is generally defined in its own QML file. You can import components to
-    screens and applications.
+    applications.
+
+    The \uicontrol {Library} pane lists the available QML types, UI
+    components, resources, and imports.
+
+    \image qmldesigner-qml-components.png "QML Components"
+
+    The \uicontrol {QML Types} tab displays the QML types grouped by category:
+    your own QML components, basic types, layouts, positioner types, and views.
+
+    Sets of UI components with the look and feel of a particular mobile device
+    platform have been defined for Qt Quick 1. Since Qt 5.1, ready-made Qt
+    Quick Controls, Dialogs, and Layouts are available for creating user
+    interfaces using Qt Quick 2. The components and controls are based on
+    standard QML types. To view the components and controls in the
+    \uicontrol {Library}, import the component sets in \uicontrol Imports.
+
+    The \uicontrol {Qt Quick Application} wizards for a particular platform add
+    the import statements automatically. You can remove import statements in
+    \uicontrol Imports
+
+    \uicontrol {Resources} displays the images and other files that you copy
+    to the project folder (to the same subfolder as the QML files).
+
+    \section1 Adding Components to Designs
+
+    \image qmldesigner-visual-editor.png "Design mode"
+
+    \list 1
+        \li Drag and drop components from the \uicontrol Library (2) to the
+            \uicontrol Navigator (3) or \uicontrol {Form Editor} (1).
+        \li Select components in the \uicontrol Navigator to edit their
+            properties in the \uicontrol Properties pane (4). For more
+            information, see \l {Specifying Item Properties}.
+        \li Connect components to signals or create bindings between components
+            in the \uicontrol Connections pane (5). For more information, see
+            \l{Adding Connections}.
+        \li Add states to apply sets of changes to the properties of one or
+            several components in the \uicontrol States pane (6). For more
+            information, see \l{Adding States}.
+    \endlist
+
+    \section1 Using Basic QML Types
 
     You can use the following QML types to create components:
 
     \list
-
+        \li \l [QML]{BorderImage}{Border Image} uses an image as a border or
-        \li \l [QML]{BorderImage}{Border Image} uses an image as a border or background.
+            background.
-
+        \li \l [QML]{Image} adds a bitmap to the scene. You can stretch and
-        \li \l [QML]{Image}
+            tile images.
-            adds a bitmap to the scene. You can stretch and tile images.
+        \li \l [QML]{Item} is the most basic of all visual types in QML. Even
-
+            though it has no visual appearance, it defines all the properties
-        \li \l [QML]{Item}
+            that are common across visual types, such as the x and y position,
-            is the most basic of all visual types in QML. Even though it has no
+            width and height, anchoring, and key handling.
-            visual appearance, it defines all the properties that are common
+        \li \l [QML]{Rectangle} adds a rectangle that is painted with a solid
-            across visual types, such as the x and y position, width and height,
+            fill color and an optional border. You can use the radius property
-            anchoring, and key handling.
+            to create rounded rectangles.
-
-        \li \l [QML]{Rectangle}
-            adds a rectangle that is painted with a solid fill color and an
-            optional border. You can also use the radius property to create
-            rounded rectangles.
-
         \li \l [QML]{Text} adds formatted read-only text.
-
+        \li \l [QML]{TextEdit}{Text Edit} adds a single line of editable
-        \li \l [QML]{TextEdit}{Text Edit}
+            formatted text that can be validated.
-            adds a single line of editable formatted text that can be validated.
+        \li \l [QML]{TextInput}{Text Input} adds a single line of editable
-
+            plain text that can be validated.
-        \li \l [QML]{TextInput}{Text Input}
-            adds a single line of editable plain text that can be validated.
-
-        \omit
-        \li \l{WebView} adds web content to a canvas.
-        \endomit
-
     \endlist
 
-    \section1 Using Qt Quick Controls
+    \section1 Using Data Models
+
+    You can create the following types of views to organize items provided by
+    \l{Models and Views in Qt Quick}{data models}:
+
+    \list
+        \li \l{GridView}{Grid View} provides a grid vizualization of a model.
+        \li \l{ListView}{List View} provides a list vizualization of a model.
+        \li \l{PathView}{Path View} visualizes the contents of a model along a
+            path.
+    \endlist
+
+    When you add a \l{GridView}{Grid View}, \l{ListView}{List View}, or
+    \l{PathView}{Path View}, the ListModel and the delegate component that
+    creates an instance for each item in the model are added automatically.
+    You can edit item properties in the \uicontrol Properties pane or
+    in the \uicontrol {Text Editor}. You can also replace the default model and
+    delegate with other, more complex models and delegates in the
+    \uicontrol {Text Editor}.
+
+    \section1 Positioning Items on Screens
+
+    The position of an item on the canvas can be either absolute or relative
+    to other items. If you are designing a static user interface,
+    \l{Important Concepts In Qt Quick - Positioning#manual-positioning}
+    {manual positioning} provides the most efficient form of positioning items
+    on the screen. For a dynamic user interface, you can employ the following
+    positioning methods provided by Qt Quick:
+
+    \list
+        \li \l{Setting Bindings}
+        \li \l{Setting Anchors and Margins}
+        \li \l{Using Positioners}
+        \li \l{Using Layouts}
+        \li \l{Organizing Items}
+    \endlist
+
+    \section2 Setting Bindings
+
+    \l{Positioning with Bindings} {Property binding} is a declarative way of
+    specifying the value of a property. Binding allows a property value to be
+    expressed as a JavaScript expression that defines the value relative to
+    other property values or data accessible in the application. The property
+    value is automatically kept up to date if the other properties or data
+    values change.
+
+    Property bindings are created implicitly in QML whenever a property is
+    assigned a JavaScript expression. To set JavaScript expressions as values
+    of properties in the Design mode, select the \uicontrol Nut menu next to
+    a property, and then select \uicontrol {Set Binding}.
+
+    \image qmldesigner-set-expression.png "Type properties context menu"
+
+    The \uicontrol {Binding Editor} supports code completion. Start typing a
+    string and press \key Ctrl+Space to display a list of properties, IDs, and
+    code snippets. When you enter a period (.) after a property name, a list of
+    available values is displayed. Press \key Enter to accept the first
+    suggestion in the list and to complete the code.
+
+    \image qmldesigner-binding-editor.png "Binding Editor"
+
+    To remove bindings, select \uicontrol Reset in the context menu.
+
+    You can set bindings also in the \uicontrol Connections view. For more
+    information, see \l {Adding Bindings Between Properties}.
+
+    For more information on the JavaScript environment provided by QML, see
+    \l{Integrating QML and JavaScript}.
+
+    Bindings are a black box for the Design mode and using them might have a
+    negative impact on performance, so consider setting anchors and margins for
+    items, instead. For example, instead of setting \c {parent.width} for an
+    item, you could anchor the item to its sibling items on the left and the
+    right.
+
+    \section2 Setting Anchors and Margins
+
+    In an \l{Important Concepts In Qt Quick - Positioning#anchors}
+    {anchor-based} layout, each QML type can be thought of as having a set of
+    invisible \e anchor lines: top, bottom, left, right, fill, horizontal
+    center, vertical center, and baseline.
+
+    In the \uicontrol Layout pane you can set anchors and margins for items. To
+    set the anchors of an item, click the anchor buttons. You can combine the
+    top/bottom, left/right, and horizontal/vertical anchors to anchor items in
+    the corners of the parent item or center them horizontally or vertically
+    within the parent item.
+
+    \image qmldesigner-anchor-buttons.png "Anchor buttons"
+
+    For convenience, you can click the \inlineimage anchor_fill.png
+    (\uicontrol {Fill to Parent}) toolbar button to apply fill anchors to an
+    item and the \inlineimage qtcreator-anchors-reset-icon.png
+    (\uicontrol {Reset Anchors}) button to reset the anchors to their saved
+    state.
+
+    You can specify the baseline anchor in the \uicontrol {Text Editor} in the
+    Design mode.
+
+    For performance reasons, you can only anchor an item to its siblings
+    and direct parent. By default, an item is anchored to its parent when
+    you use the anchor buttons. Select a sibling of the item in the
+    \uicontrol Target field to anchor to it, instead.
+
+    Arbitrary anchoring is not supported. For example, you cannot specify:
+    \c {anchor.left: parent.right}. You have to specify:
+    \c {anchor.left: parent.left}. When you use the anchor buttons, anchors to
+    the parent item are always specified to the same side. However, anchors to
+    sibling items are specified to the opposite side:
+    \c {anchor.left: sibling.right}. This allows you to keep sibling items
+    together.
+
+    In the following image, \uicontrol{Rectangle 2} is anchored to
+    \uicontrol {Rectangle 1} on its left and to the bottom of its parent.
+
+    \image qmldesigner-anchors.png "Anchoring sibling items"
+
+    The anchors for \uicontrol{Rectangle 2} are specified as follows in code:
+
+    \qml
+    Rectangle {
+        id: rectangle2
+        anchors.left: rectangle1.right
+        anchors.leftMargin: 15
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: 15
+        //
+    }
+    \endqml
+
+    Margins specify the amount of empty space to leave to the outside of an
+    item. Margins only have meaning for anchors. They do not take any effect
+    when using layouts or absolute positioning.
+
+    \section2 Using Positioners
+
+    \l{Important Concepts In Qt Quick - Positioning#positioners}
+    {Positioner items} are container items that manage the positions of items
+    in a declarative user interface. Positioners behave in a similar way to
+    the layout managers used with standard Qt widgets, except that they are
+    also containers in their own right.
+
+    You can use the following positioners to arrange items on screens:
+
+    \list
+        \li \l[QML] {Column} arranges its child items vertically.
+        \li \l[QML] {Row} arranges its child items horizontally.
+        \li \l[QML] {Grid}
+            arranges its child items so that they are aligned in a grid and
+            are not overlapping.
+        \li \l[QML] {Flow}
+            arranges its child items side by side, wrapping as necessary.
+    \endlist
+
+    To lay out several items in a \uicontrol Column, \uicontrol Row,
+    \uicontrol Grid, or \uicontrol Flow, select the items on the canvas, and
+    then select \uicontrol Layout in the context menu.
+
+    \section2 Using Layouts
+
+    Since Qt 5.1, you can use QML types in the \l{qtquicklayouts-index.html}
+    {Qt Quick Layouts} module to arrange Qt Quick items on screens. Unlike
+    positioners, they manage both the positions and sizes of items in a
+    declarative interface. They are well suited for resizable user interfaces.
+
+    You can use the following layout types to arrange items on screens:
+
+    \list
+        \li \l{Layout} provides attached properties for items pushed onto a
+            \uicontrol {Column Layout}, \uicontrol {Row Layout}, or
+            \uicontrol {Grid Layout}.
+        \li \l{ColumnLayout}{Column Layout} provides a grid layout with only
+            one column.
+        \li \l{RowLayout}{Row Layout} provides a grid layout with only one row.
+        \li \l{GridLayout}{Grid Layout} provides a way of dynamically arranging
+            items in a grid.
+        \li \l{StackLayout}{Stack Layout} provides a stack of items where only
+            one item is visible at a time.
+    \endlist
+
+    To lay out several items in a \uicontrol {Column Layout},
+    \uicontrol {Row Layout}, \uicontrol {Grid Layout}, or
+    \uicontrol {Stack Layout}, select the items in the \uicontrol {Form Editor},
+    and then select \uicontrol Layout in the context menu.
+
+    You can also click the \inlineimage column.png
+    (\uicontrol {Column Layout}), \inlineimage row.png
+    (\uicontrol {Row Layout}), and \inlineimage grid.png
+    (\uicontrol {Grid Layout}) toolbar buttons to apply
+    layouts to the selected items.
+
+    To make an item within a layout as wide as possible while respecting
+    the given constraints, select the item on the canvas and then select
+    \uicontrol Layout > \uicontrol {Fill Width} in the context menu. To
+    make the item as high as possible, select \uicontrol {Fill Height}.
+
+    \section2 Editing Stack Layouts
+
+    \image qtquick-designer-stacked-view.png
+
+    To add items to a \uicontrol {Stack Layout}, select the
+    \inlineimage plus.png
+    button next to the type name in the \uicontrol {Form Editor}. To move
+    between items, select the \inlineimage prev.png
+    (\uicontrol Previous) and \inlineimage next.png
+    (\uicontrol Next) buttons.
+
+    To add a tab bar to a stack layout, select \uicontrol {Stacked Container} >
+    \uicontrol {Add Tab Bar}.
+
+    To raise or lower the stacking order of an item, select
+    \uicontrol {Stacked Container} > \uicontrol {Increase Index} or
+    \uicontrol {Decrease Index}.
+
+    \section2 Organizing Items
+
+    Since Qt 5.7, you can use the following \l{Qt Quick Controls 2} types to
+    organize items on screens:
+
+    \list
+        \li \l [QtQuickControls2]{Frame} places a logical group of controls
+            within a visual frame.
+        \li \l [QtQuickControls2]{GroupBox}{Group Box} is used to lay out a
+            logical group of controls together, within a titled visual frame.
+        \li \l [QtQuickControls2]{Label} is a text label with inherited styling
+            and font.
+        \li \l [QtQuickControls2]{PageIndicator}{Page Indicator} indicates the
+            currently active page.
+        \li \l [QtQuickControls2]{Pane} provides a background matching with the
+            application style and theme.
+    \endlist
+
+    \section1 Adding User Interaction Methods
+
+    You can use the following QML types to add basic interaction methods to
+    screens:
+
+    \list
+        \li \l{Flickable}
+            items can be flicked horizontally or vertically.
+        \li \l{FocusScope}{Focus Scope}
+            assists in keyboard focus handling when building reusable QML
+            components.
+        \li \l [QML]{MouseArea}{Mouse Area} enables simple mouse handling.
+    \endlist
+
+    Since Qt 5.7, you can also use the following \l{Qt Quick Controls 2} types
+    to inform users about the progress of the application or to gather input
+    from the user:
+
+    \list
+        \li \l [QtQuickControls2]{BusyIndicator}{Busy Indicator} indicates
+            activity while content is being loaded.
+        \li \l [QtQuickControls2]{Button} provides a push button that you can
+            associate with an action.
+        \li \l [QtQuickControls2]{CheckBox}{Check Box} provides an option button
+            that can be toggled on (checked) or off (unchecked).
+        \li \l [QtQuickControls2]{CheckDelegate}{Check Delegate} presents an
+            item delegate that can be toggled on (checked) or off (unchecked).
+        \li \l [QtQuickControls2]{ComboBox}{Combo Box} is a combined button and
+            popup list that is populated by using a data model.
+        \li \l [QtQuickControls2]{Dial} is a circular dial that is rotated to
+            set a value.
+        \li \l [QtQuickControls2]{ItemDelegate}{Item Delegate} is a standard
+            view item that can be used in various views and controls.
+        \li \l [QtQuickControls2]{ProgressBar}{Progress Bar} indicates the
+            progress of an operation.
+        \li \l [QtQuickControls2]{RadioButton}{Radio Button} provides an option
+            button that can be switched on (checked) or off (unchecked).
+        \li \l [QtQuickControls2]{RadioDelegate}{Radio Delegate} presents an
+            item delegate that can be toggled on (checked) or off (unchecked).
+        \li \l [QtQuickControls2]{Slider} selects a value by sliding a handle
+            along a track.
+        \li \l [QtQuickControls2]{SpinBox}{Spin Box} enables the user to specify
+            a value by clicking the up or down buttons, by pressing up or down
+            on the keyboard, or by entering a value in the box.
+        \li \l [QtQuickControls2]{Switch} is an option button that can be
+            toggled on or off.
+        \li \l [QtQuickControls2]{TextArea}{Text Area} displays multiple lines
+            of editable formatted text.
+        \li \l [QtQuickControls2]{TextField}{Text Field} displays a single line
+            of editable plain text.
+        \li \l [QtQuickControls2]{ToolBar}{Tool Bar} is a container of
+            application-wide and context sensitive actions and controls, such as
+            navigation buttons and search fields.
+        \li \l [QtQuickControls2]{ToolButton}{Tool Button} is a button
+            that is functionally similar to \uicontrol Button, but provides a
+            look that is more suitable for a \uicontrol {Tool Bar}.
+        \li \l [QtQuickControls2]{Tumbler} is a spinnable wheel of items that
+            can be selected.
+    \endlist
+
+    \section1 History of Qt Quick Controls
 
     In Qt 4, ready-made Qt Quick 1 Components were provided for creating
     screens with a native look and feel for a particular target platform.

doc/src/qtquick/qtquick-connection-editor.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -24,7 +24,7 @@
 ****************************************************************************/
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage qmldesigner-pathview-editor.html
     \page qmldesigner-connections.html
     \nextpage quick-signals.html

doc/src/qtquick/qtquick-creating.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -31,7 +31,7 @@
 
 /*!
 
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-visual-editor.html
     \page quick-projects.html
     \nextpage creator-quick-ui-forms.html

doc/src/qtquick/qtquick-designer.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -30,10 +30,10 @@
 // **********************************************************************
 
 /*!
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage creator-quick-ui-forms.html
     \page creator-using-qt-quick-designer.html
-    \nextpage qmldesigner-pathview-editor.html
+    \nextpage quick-components.html
 
     \title Editing QML Files in Design Mode
 
@@ -65,14 +65,17 @@
             \li \uicontrol {Library} (2) displays the building blocks that you
                 can use to design applications: predefined QML types, your own
                 QML components, or Qt Quick Controls 2 that you import to the
-                project, and other resources.
+                project, and other resources. For more information, see
+                \l {Creating Components}.
 
             \li \uicontrol {Navigator} (3) displays the items in the current QML
-                file as a tree structure.
+                file as a tree structure. For more information, see
+                \l {Managing Item Hierarchy}.
 
             \li \uicontrol {Properties} (4) organizes the properties of the
                 selected item. You can change the properties also in the
-                \uicontrol {Text Editor}.
+                \uicontrol {Text Editor}. For more information, see
+                \l {Specifying Item Properties}.
 
             \li \uicontrol Connections (5) enables you to create connections
                 between objects, signals, and object properties. For more
@@ -97,341 +100,10 @@
 
     \endlist
 
-    \section1 Managing Item Hierarchy
+    \section1 Snapping to Parent and Sibling Items
-
-    The \uicontrol Navigator displays the items in the current QML file and their
-    relationships.
-    Items (1) are listed in a tree structure, below their parent (2).
-
-    \image qmldesigner-navigator.png "Navigator"
-
-    You can select items in the \uicontrol Navigator to edit their properties
-    in the \uicontrol Properties pane. Items can access the properties of their
-    parent item. To select items on the canvas, right-click an item,
-    and select another type in the context menu.
-
-    Typically, child items are located within the parent item on the
-    canvas. However, they do not necessarily have to fit inside the parent
-    item. For example, you might want to make a mouse area larger than the
-    rectangle or image beneath it (1).
-
-    \image qmldesigner-element-size.png "Mouse area for a button"
-
-    When you copy an item, all its child items are also copied. When
-    you remove an item, the child items are also removed.
-
-    You can show and hide items on the canvas to focus on specific parts of the
-    application. Click the \inlineimage icon_color_none.png
-    (\uicontrol Transparent) button to change the visibility of an item on the
-    canvas. To change the
-    visibility of an item in the application, select the \uicontrol Visibility
-    check box in the \uicontrol Properties pane or select \uicontrol Edit >
-    \uicontrol Visibility in the context menu.
-
-    You can also set the \uicontrol Opacity field to 0 to hide items that you
-    want to apply animation to.
-
-    As all properties, visibility and opacity are inherited from the parent
-    item. To hide or show child items, edit the properties of the parent item.
-
-    To hide invisible items in the navigator, click \inlineimage filtericon.png
-    (\uicontrol {Filter Tree}) and select \uicontrol {Show only visible items}.
-
-    To reset item size, position, or anchors, select context menu commands. To
-    change the source of an Image type, select \uicontrol {Change Source URL} in
-    the context menu.
-
-    To view lists of files or projects, instead, select \uicontrol {File System},
-    \uicontrol {Open Documents}, or \uicontrol Projects in the menu.
-    To view several types of content at a time, split the sidebars by clicking
-    the \inlineimage splitbutton_horizontal.png
-    (\uicontrol Split) button.
-
-    \section2 Setting the Stacking Order
-
-    The \c z property of an \l Item determines its position in relation to its
-    sibling items in the
-    type hierarchy. By default, items with a higher stacking value are
-    drawn on top of siblings with a lower stacking value. Items with the same
-    stacking value are drawn in the order they are listed, from the last item
-    up.
-
-    To raise or lower the stack value of an item, select \inlineimage raise.png
-    (\uicontrol Raise) or \inlineimage lower.png
-    (\uicontrol Lower) on the toolbar.
-
-    To move an item to the front or back of all its siblings, right-click it in
-    the navigator or the \uicontrol {Form Editor} and select
-    \uicontrol {Stack (z)}. To remove the \c z property, select
-    \uicontrol {Reset z Property}.
-
-    You can also use a \uicontrol StackLayout item (Qt Quick Controls 2) to
-    create a stacked view. For more information, see \l {Using Layouts}.
-
-    \section2 Switching Parent Items
-
-    When you drag and drop instances of QML types to the canvas, the new item
-    is added as a child of the item beneath it. When you move items on the
-    canvas, it is not possible to determine
-    whether you want to adjust their position or attach them to a new
-    parent item. Therefore, the parent item is not automatically
-    changed. To change the parent of the item, press down the \key Shift
-    key before you drag and drop the item into a new position. The topmost
-    item under the cursor becomes the new parent of the item.
-
-    You can change the parent of an item also in the \uicontrol Navigator.
-    Drag and drop the item to another position in the tree or use the arrow
-    buttons (1) to move the item in the tree.
-
-    \image qmldesigner-navigator-arrows.png "Navigator arrow buttons"
-
-    \section1 QML Type Library
-
-    The \uicontrol {Library} enables you to select QML types, UI components, and
-    resources, as well as to manage imports.
-
-    \uicontrol {QML Types} displays the QML types grouped by category: your own QML
-    components, basic types, layouts, positioner types, and views.
-
-    Sets of UI components with the look and feel of a particular mobile device
-    platform have been defined for Qt Quick 1. Since Qt 5.1, ready-made Qt
-    Quick Controls, Dialogs, and Layouts are available for creating user
-    interfaces using Qt Quick 2.1. The components and controls are based on
-    standard QML types. To view the components and controls in the
-    \uicontrol {Library}, import the component sets in \uicontrol Imports.
-
-    The \uicontrol {Qt Quick Application} wizards for a particular platform add the
-    import statements automatically. You can remove import statements in
-    \uicontrol Imports
-
-    \image qmldesigner-qml-components.png "QML Components"
-
-    \uicontrol {Resources} displays the images and other files that you copy
-    to the project folder (to the same subfolder as the QML files).
-
-    \section1 Specifying Item Properties
-
-    The \uicontrol Properties pane displays all the properties of the selected item.
-    The properties are grouped by type. The top part of the pane
-    displays properties that are common to all QML types, such as
-    position, size, and visibility.
-
-    The bottom part of the pane displays properties that are specific to each
-    QML type. For example, the following image displays the properties you
-    can set for \uicontrol Rectangle (1) and \uicontrol Text (2) items.
-
-    \image qmldesigner-element-properties.png
-
-    To change the item type, double-click the \uicontrol Type field in the
-    \uicontrol Properties pane, and enter the name of another QML type in the
-    field. If you have specified properties for the item that are not supported
-    for the new type, the type cannot be changed and an error message is
-    displayed. Remove the properties in the \uicontrol {Text Editor} and try
-    again.
-
-    To return an item to its implicit position after moving it, select the
-    \inlineimage qtcreator-reset-position-icon.png
-    (\uicontrol {Reset Position}) button on the toolbar. To return it to its
-    implicit size, select \inlineimage qtcreator-reset-size-icon.png
-    (\uicontrol {Reset Size}) button.
-
-    To set the visibility of the item, select \uicontrol {Edit > Visibility} in the context menu.
-
-    To specify the color of the selected item in the \uicontrol {Select Color}
-    dialog, select \uicontrol {Edit Color} in the context menu.
-
-    For more information on the properties available for an item, press
-    \key {F1}.
-
-    \section2 Viewing Changes in Properties
-
-    The default values of properties are displayed in white color, while the
-    values that you specify explicitly are highlighted with blue color. In
-    addition, property changes in states are highlighted with blue.
-
-    This allows you to easily see which values are set in the UI form or
-    QML file and
-    which values are default characteristics of a QML type or a component.
-
-    When editing states, you can easily see which values are explicitly set in
-    the current state and which values are derived from the base state.
-
-    The following images illustrate this. In the base state, the \uicontrol Size (1)
-    and \uicontrol Colors (2) values are explicitly set and highlighted.
-
-    \image qmldesigner-properties-explicit-base.png "Explicitly set properties"
-
-    In \uicontrol State1, only the color (1) is explicitly set and highlighted.
-
-    \image qmldesigner-properties-explicit-state1.png "Explicitly set properties"
-
-    Resetting a property sets it back to the default value and removes the value
-    from the UI form or QML file.
-
-    \note As a result, all boolean values can be visualized in four different
-    ways.
-
-    For example, visibility can be visualized as follows:
-
-    \table
-        \row
-            \li \image qmldesigner-boolean-true.png
-            \li TRUE
-            \li The QML type is visible by default. The visibility might be
-                overridden by the visibility set in the base state.
-        \row
-            \li \image qmldesigner-boolean-true-blue.png
-            \li TRUE (highlighted)
-            \li The QML type is explicitly set to visible.
-        \row
-            \li \image qmldesigner-boolean-false.png
-            \li FALSE
-            \li The QML type is hidden by default. The visibility might be
-                overridden by the visibility set in the base state.
-        \row
-            \li \image qmldesigner-boolean-false-blue.png
-            \li FALSE (hightlighted)
-            \li The type is explicitly set to hidden.
-    \endtable
-
-    \section2 Marking Text Items for Translation
-
-    To support translators, mark each text item that should be translated.
-    In the \uicontrol Properties pane, \uicontrol Text field, select \uicontrol tr (1).
-
-    \image qmldesigner-text-property-tr.png "Text properties"
-
-    By default, the text string is enclosed in a \c qsTr() call.
-
-    \image qml-translate.png "Text marked for translation"
-
-    If you use text IDs instead of plain text, change the default call to
-    \c qsTrId(). Select \uicontrol Tools > \uicontrol Options >
-    \uicontrol {Qt Quick} > \uicontrol {\QMLD}, and then select the
-    \uicontrol {qsTrId()} radio button in the \uicontrol Internationalization
-    group. For more information about text ID based translations, see
-    \l {Qt Linguist Manual: Text ID Based Translations}.
-
-    To preserve the context when editing the text or to change the context
-    by setting a binding on the text property, change the default call to
-    \c qsTranslate() by selecting the \uicontrol {qsTranslate()} radio button.
-
-    For more information, see
-    \l {Internationalization and Localization with Qt Quick}.
-
-    \section2 Loading Placeholder Data
-
-    The Design mode supports views, models, and delegates, so that when you add
-    a Grid View, List View, or Path View item, the ListModel and the delegate
-    item are added automatically.
-
-    However, the missing context of the application presents a challenge.
-    Specific models defined in C++ are the most obvious case. Often,
-    the context is missing simple properties, which are either defined in C++,
-    or in other QML files. A typical example is an item that uses the
-    properties of its parent, such as \c parent.width.
-
-    \section3 Using Dummy Models
-
-    If you open a file in the Design mode that references a C++ model, you see
-    nothing on
-    the canvas. If the data in the model is fetched from the internet, you have
-    no control over it. To get reliable data, \e {dummy data} was introduced.
-
-    For example, the following code snippet describes the file example.qml that
-    contains a ListView that in turn specifies a C++ model:
-
-    \qml
-        ListView {
-            model: dataModel
-            delegate: ContactDelegate {
-                name: name
-            }
-        }
-    \endqml
-
-    Create a directory named \e dummydata in the root directory of the project,
-    so that it is not deployed to the device. In the \c dummydata directory,
-    create a QML file that has the same name as the value of \c model:
-
-    \code
-        qml/exampleapp/example.qml
-        dummydata/dataModel.qml
-    \endcode
-
-    Then create the dataModel.qml file that contains the dummy data:
-
-    \qml
-        import QtQuick 1.0
-
-        ListModel {
-             ListElement {
-                 name: "Ariane"
-             }
-             ListElement {
-                 name: "Bella"
-             }
-             ListElement {
-                 name: "Corinna"
-             }
-        }
-    \endqml
-
-    \section3 Creating Dummy Context
-
-    The following example presents a common pattern in QML:
-
-    \qml
-        Item {
-            width: parent.width
-            height: parent.height
-        }
-    \endqml
-
-    This works nicely for applications but the Design mode displays a zero-sized
-    item. A parent for the opened file does not exist, because the context is
-    missing. To get around the missing context, the idea of a \e {dummy
-    context} is introduced. If you place a file with the same name as the
-    application (here, example.qml) in the \c {dummydata/context} directory,
-    you can fake a parent context:
-
-    \qml
-        import QtQuick 1.0
-        import QmlDesigner 1.0
-
-        DummyContextObject {
-            parent: Item {
-                width: 640
-                height: 300
-            }
-        }
-    \endqml
-
-    \section2 Building Transformations on Items
-
-    The \uicontrol Advanced pane allows you to configure advanced transformations,
-    such as rotation, scale, and translation. You can assign any number of
-    transformations to an item. Each transformation is applied in order, one at
-    a time.
-
-    For more information on Transform types, see \l{Transform}.
-
-    \section2 Editing Properties Inline
-
-    You can double-click objects on the canvas to edit their text, color, or
-    source properties inline.
-    Because you can specify several of these properties for some QML types, such
-    as \l [QML]{TextEdit}{Text Edit}, you can also right-click objects to open
-    the inline editors from a context-menu.
-
-    \image qmldesigner-inline-editing.png
-
-    \section1 Working with QML Types on Canvas
 
     You design applications on the canvas by placing items on it.
 
-    \section2 Snapping to Parent and Sibling Items
-
     When you are working on a design, you can use snapping to align
     items on the canvas. Click the \inlineimage snapping.png
     button to have the items snap to their parent or sibling items. Snapping
@@ -451,13 +123,13 @@
 
     \image qmldesigner-snap-margins.png "Snapping lines on canvas"
 
-    \section2 Hiding Item Boundaries
+    \section1 Hiding Item Boundaries
 
     The Design mode displays the boundaries of items on the canvas. To hide
     the boundaries, click the \inlineimage boundingrect.png
     button.
 
-    \section2 Selecting Items
+    \section1 Selecting Items
 
     When you point the mouse to overlapping items, the frontmost item is
     selected by default. However, items that do not have any content, such as
@@ -467,7 +139,7 @@
     \inlineimage qmldesigner-only-select-items-with-content.png
     button.
 
-    \section2 Previewing Component Size
+    \section1 Previewing Component Size
 
     The width and height of the root item in a QML file determine the size of
     the component. You can reuse components, such as buttons, in different
@@ -485,13 +157,13 @@
 
     \image qmldesigner-preview-size.png "Canvas width and height"
 
-    \section2 Specifying Canvas Size
+    \section1 Specifying Canvas Size
 
     To change the canvas size, select \uicontrol Tools > \uicontrol Options >
     \uicontrol {Qt Quick} > \uicontrol {\QMLD} and
     specify the canvas width and height in the \uicontrol Canvas group.
 
-    \section2 Refreshing the Canvas
+    \section1 Refreshing the Canvas
 
     When you open QML files in the Design mode, the items in the file are drawn
     on the canvas. When you edit the item properties, the QML file and

doc/src/qtquick/qtquick-exporting-qml.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -31,7 +31,7 @@
 
 /*!
 
-    \contentspage {Qt Creator Manual}
+    \contentspage index.html
     \previouspage qtquick-iso-icon-browser.html
     \page quick-export-to-qml.html
     \nextpage creator-qml-modules-with-plugins.html