Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
	.qmake.conf
	doc/src/external-resources.qdoc

Change-Id: I62bb845b837787385de233019436039e77a41f08

7 files changed, 36 insertions, 70 deletions

diff --git a/doc/src/development/cmake-manual.qdoc b/doc/src/development/cmake-manual.qdoc
index fc27c5bf..08e482e0 100644
--- a/doc/src/development/cmake-manual.qdoc
+++ b/doc/src/development/cmake-manual.qdoc
@@ -96,7 +96,13 @@
     associated. They provide a list of plugins in the
     \c{Qt5}\e{<Module>}\c{_PLUGINS} variable.
 
-    \snippet snippets/cmake/CMakeLists.pro 7
+    \snippet snippets/cmake/CMakeLists.pro 5
+
+    \section2 Using Qt 5 with \c{CMake} older than 2.8.12
+
+    It is also necessary when using an older \c{CMake} to add Qt5<Module>_EXECUTABLE_COMPILE_FLAGS to
+    the CMAKE_CXX_FLAGS so that the -fPIC flags are added to the compile flags if necessary (as
+    is the default with Qt 5).
 
     \section2 Using Qt 5 with \c{CMake} older than 2.8.11
 
@@ -124,24 +130,6 @@
 
     \snippet snippets/cmake/CMakeLists.pro 4
 
-    It is also necessary when using an older \c{CMake} to add Qt5<Module>_EXECUTABLE_COMPILE_FLAGS to
-    the CMAKE_CXX_FLAGS so that the -fPIE flags are added to the compile flags if necessary (as
-    is the default with Qt 5).
-
-    If not using the \c{qt5_use_modules} macro, and if using CMake 2.8.9 or later, the
-    \l{CMake POSITION_INDEPENDENT_CODE Documentation}{POSITION_INDEPENDENT_CODE property} can be set on
-    targets using Qt instead, or it can be set globally for all targets. Note that this is not necessary
-    with CMake 2.8.11:
-
-    \snippet snippets/cmake/CMakeLists.pro 5
-
-    Note that it may be necessary to enable POSITION_INDEPENDENT_CODE globally in order to use try_compile
-    with Qt code, or any wrapper macros around it such as check_cxx_source_compiles etc.
-    As position independent code is a platform-specific and Qt-configuration-specific concept, the
-    Qt5_POSITION_INDEPENDENT_CODE property can be used to check whether it is required.
-
-    \snippet snippets/cmake/CMakeLists.pro 6
-
     \section1 Variable Reference
 
     \section2 Module variables
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 922385f0..3eff9122 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -178,6 +178,12 @@
     \externalpage http://doc.qt.io/qtcreator/creator-configuring.html
     \title Configuring Qt Creator
 */
+
+/*!
+    \externalpage http://doc.qt.io/qtcreator/creator-deploying-android.html#specifying-settings-for-packages
+    \title Android APK
+*/
+
 /*!
     \externalpage http://doc.qt.io/qtcreator/creator-build-example-application.html
     \title Building and Running Example
diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc
index c78d686c..33a75a40 100644
--- a/doc/src/platforms/android.qdoc
+++ b/doc/src/platforms/android.qdoc
@@ -253,18 +253,6 @@ application to Android using the qrc approach:
      \note QML documents can refer to the contents in qrc files using the
      relative path to the document. Such references do not require the
      "\c{qrc:}" or "\c{:/}" prefix.
- \li Update the "Run" settings for your project as described in the
-     \l{Qt Creator: Specifying Run Settings}
-
-     \note You can change the default settings for application icons and
-     identifier.
- \li If your application uses imports or plugins which depend on special Qt
-     modules, these Qt modules should be added to the .pro file. For example, if
-     your application uses the \l{Qt Multimedia} import in QML, you should add
-     the following to your .pro file:
-     \code
-     QT += multimedia
-     \endcode
  \li Save the changes to your project and run the application.
 \endlist
 
@@ -326,9 +314,9 @@ the APK:
  \li Run \c{make build_libs} to build the \c libcrypto and \c libssl shared
      libraries.
 
- \li Open your Qt project using Qt Creator and update the
-     "Deployment Configuration" under run settings to add \e libcrypto and
-     \e libssl as additional libraries required for your project.
+ \li Open your Qt project using Qt Creator and update the "Build Android APK"
+     settings to add \e libcrypto and \e libssl as additional libraries for
+     your project.
 
  \li Run your application to see it running on the device.
 \endlist
@@ -358,10 +346,9 @@ on Google Play:
  \li Open your application project using Qt Creator v3.0 or later and change
  its \uicontrol Build settings to build release version.
 
- \li Open \uicontrol Run settings of your project and select
- \uicontrol {Create AndroidManifest.xml}. Qt Creator adds the manifest XML
- based on the application's \e .pro file and opens it in \uicontrol General
- mode.
+ \li Select \uicontrol {Create Templates} under \uicontrol Build settings to
+ create the template files such as \e AndroidManifest.xml and other
+ resources.
 
  \note You can edit the \e AndroidManifest.xml in \uicontrol General or
  \uicontrol {XML Source} mode.
@@ -388,7 +375,8 @@ on Google Play:
  information on the manifest XML format, see \l{Android: App Manifest}.
 
  \li Set up a \uicontrol keystore to sign the \e .apk. You can create a new
- keystore if you do not have one.
+ keystore if you do not have one. For more details, see
+ \l{Android APK}{QtCreator: Specifying Settings for Packages}.
 
  \li Select \uicontrol{Open package location after build} and run your
  application to build the \e .apk. Qt Creator builds the \e .apk and opens the
diff --git a/doc/src/platforms/platform-notes-rtos.qdoc b/doc/src/platforms/platform-notes-rtos.qdoc
index ac0e821c..76af7663 100644
--- a/doc/src/platforms/platform-notes-rtos.qdoc
+++ b/doc/src/platforms/platform-notes-rtos.qdoc
@@ -44,8 +44,6 @@
     \contentspage Platform and Compiler Notes
     \target QNX
 
-    \note QNX Neutrino RTOS is a community supported platform. See the \l{http://wiki.qt.io/Qnx}{related page} on the Qt Project wiki.
-
     \section1 Supported Architectures and QNX Releases
 
     From the perspective of an application development platform, Qt runs on top of
@@ -67,12 +65,12 @@
 
     For a specific list of available boards, displays and input devices, contact QNX Software
     Systems (info@qnx.com) or KDAB (qnx-info@kdab.com). Qt on the QNX Neutrino OS is also supported
-    by Qt Enterprise Embedded, \l {http://qt.digia.com/About-Us/Contact-Us/}{contact Digia Qt}
+    by Qt Enterprise Embedded, \l {http://www.qt.io/contact-us/}{contact The Qt Company}
     for more details.
 
     \section1 Supported Modules
 
-    Almost all Qt Essential \l{All Modules}{modules} and quite some add-ons are supported on
+    Almost all Qt Essential \l{All Modules}{modules} and some add-ons are supported on
     the QNX Neutrino RTOS. See the \l{http://wiki.qt.io/Qt_Status_on_QNX}
     {status page on the Qt Project wiki} for details.
 
diff --git a/doc/src/qmlapp/debugging.qdoc b/doc/src/qmlapp/debugging.qdoc
index bd3814e5..6e781e90 100644
--- a/doc/src/qmlapp/debugging.qdoc
+++ b/doc/src/qmlapp/debugging.qdoc
@@ -34,6 +34,7 @@
 \section1 Console API
 
 \section2 Log
+\keyword console log
 
 \c console.log, console.debug, console.info, console.warn and console.error can be used to print
 debugging information to the console. For example:
@@ -48,6 +49,7 @@ The output is generated using the qDebug, qWarning, qCritical methods in C++
 (see also \l {Debugging Techniques}).
 
 \section2 Assert
+\keyword console assert
 
 \c console.assert tests that an expression is true. If not, it will write an optional message
 to the console and print the stack trace.
@@ -61,7 +63,8 @@ function f() {
 \endcode
 
 \section2 Timer
-
+\keyword console time
+\keyword console timeEnd
 \c console.time and console.timeEnd log the time (in milliseconds) that was spent between
 the calls. Both take a string argument that identifies the measurement. For example:
 
@@ -77,13 +80,14 @@ function f() {
 \endcode
 
 \section2 Trace
+\keyword console trace
 
 \c console.trace prints the stack trace of the JavaScript execution at the point where
 it was called. The stack trace info contains the function name, file name, line number
 and column number. The stack trace is limited to last 10 stack frames.
 
 \section2 Count
-
+\keyword console count
 \c console.count prints the current number of times a particular piece of code has been executed,
 along with a message. That is,
 
@@ -96,10 +100,11 @@ function f() {
 will print \c{f called: 1}, \c{f called: 2} ... whenever \c{f()} is executed.
 
 \section2 Profile
-
+\keyword console profile
 \c console.profile turns on the QML and JavaScript profilers. Nested calls are not
 supported and a warning will be printed to the console.
 
+\keyword console profileEnd
 \c console.profileEnd turns off the QML and JavaScript profilers. Calling this function
 without a previous call to console.profile will print a warning to the console. A
 profiling client should have been attached before this call to receive and store the
@@ -116,7 +121,7 @@ function f() {
 \endcode
 
 \section2 Exception
-
+\keyword console exception
 \c console.exception prints an error message together with the stack trace of JavaScript
 execution at the point where it is called.
 
@@ -145,7 +150,8 @@ QQmlImportDatabase::resolveType "Rectangle" = "QDeclarativeRectangle"
 \endcode
 
 \section1 QML Debugging Infrastructure
-
+\keyword declarative_debug
+\keyword qml debug
 The \l{Qt QML} module provides services for debugging, inspecting, and profiling
 applications via a TCP port.
 
diff --git a/doc/src/snippets/cmake/CMakeLists.pro b/doc/src/snippets/cmake/CMakeLists.pro
index 5600e870..efdf4226 100644
--- a/doc/src/snippets/cmake/CMakeLists.pro
+++ b/doc/src/snippets/cmake/CMakeLists.pro
@@ -73,28 +73,8 @@ target_link_libraries(helloworld Qt5::Widgets)
 #! [4]
 
 #! [5]
-find_package(Qt5Core)
-
-add_executable(exe1 ${exe1_SRCS})
-# Set the POSITION_INDEPENDENT_CODE property for the exe1 target...
-set_target_properties(exe1 PROPERTIES POSITION_INDEPENDENT_CODE ON)
-
-# Or set it globally for all targets:
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-add_executable(exe2 ${exe2_SRCS})
-
-add_executable(exe3 ${exe3_SRCS})
-#! [5]
-
-#! [6]
-if (Qt5_POSITION_INDEPENDENT_CODE)
-  set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-endif()
-#! [6]
-
-#! [7]
 foreach(plugin ${Qt5Network_PLUGINS})
   get_target_property(_loc ${plugin} LOCATION)
   message("Plugin ${plugin} is at location ${_loc}")
 endforeach()
-#! [7]
+#! [5]
diff --git a/doc/src/snippets/code/doc_src_deployment.qdoc b/doc/src/snippets/code/doc_src_deployment.qdoc
index 764c0671..3a559436 100644
--- a/doc/src/snippets/code/doc_src_deployment.qdoc
+++ b/doc/src/snippets/code/doc_src_deployment.qdoc
@@ -41,7 +41,7 @@
 //! [0]
 cd /path/to/Qt
 ./configure -static -prefix /path/to/Qt <other parameters>
-make sub-src
+make
 //! [0]