Merge remote-tracking branch 'origin/3.4'

Conflicts:
	src/plugins/cmakeprojectmanager/cmakeproject.cpp

Change-Id: I09c5a047f7d91fecfc58c78df438afcdcdc0a8d7

doc/src/overview/creator-advanced.qdoc

@@ -24,7 +24,7 @@
 
 /*!
     \contentspage {Qt Creator Manual}
-    \previouspage creator-cpu-usage-analyzer.html
+    \previouspage creator-autotest.html
     \page creator-advanced.html
     \nextpage creator-os-supported-platforms.html
 

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

@@ -28,10 +28,13 @@
 
     \title Qt Creator Commercial Features
 
+    \commercial
+
     You can use the following \QC features if you have the appropriate
     \l{http://qt.io/licensing/}{Qt license}:
 
     \list
+        \li \l{Running Autotests}
         \li \l{Using Clang Static Analyzer}{Clang Static Analyzer} integration.
         \li Additional \l{Understanding the Data}{QML Profiler} event
             categories:

doc/src/overview/creator-overview.qdoc

@@ -92,7 +92,7 @@
                 different setups and target platforms.
 
                 For more information, see \l{Building and Running}.
-            \li \b {\l{Debugging and Analyzing}}
+            \li \b {\l{Testing}}
 
                 \QC is integrated to several external native debuggers: GNU
                 Symbolic Debugger (GDB), Microsoft Console Debugger (CDB), and
@@ -105,7 +105,11 @@
                 execution. In addition, the QML Profiler enables you to profile
                 Qt Quick applications.
 
-                For more information, see \l{Debugging and Analyzing}.
+                \QC is integrated to the \l{Qt Test} framework for unit testing
+                Qt based applications and libraries. You can use \QC to build
+                and run autotests (commercial only).
+
+                For more information, see \l{Testing}.
             \li \b {Publishing}
 
                 \QC allows you to create installation packages for mobile

doc/src/overview/creator-testing.qdoc

@@ -28,7 +28,7 @@
     \page creator-testing.html
     \nextpage creator-debugging.html
 
-    \title Debugging and Analyzing
+    \title Testing
 
     \image creator_testing.png
 
@@ -51,6 +51,11 @@
             installed as part of \QC. It enables you to profile your Qt Quick
             applications.
 
+        \li \l{Running Autotests}
+
+            You can use an experimental Auto Test plugin to build and run
+            autotests using \QC (commercial only).
+
     \endlist
 
 */