Merge remote-tracking branch 'origin/2.6'

Conflicts:
	dist/gdb/Makefile.osx
	src/libs/qmldebug/qmldebug.qbs
	src/plugins/android/androidsettingswidget.cpp

Change-Id: I85627130b575f7d08f416dea52031fa72019b217

doc/src/howto/creator-vcs.qdoc

@@ -41,6 +41,10 @@
             \o  Bazaar
             \o  \l{http://bazaar.canonical.com/}
             \o  \QC 2.2 and later
+        \row
+            \o  ClearCase
+            \o  \l{http://www-01.ibm.com/software/awdtools/clearcase/}
+            \i  Experimental plugin in \QC 2.6
         \row
             \o  CVS
             \o  \l{http://www.cvshome.org}
@@ -304,7 +308,45 @@
 
     \endtable
 
-    \section2 Using Additional CVS Functions
+    \section2 Using Additional ClearCase Functions
+
+    IBM Rational ClearCase is a version control, workspace management, parallel
+    development support, and build automation solution developed by IBM. The
+    ClearCase client plugin is an experimental plugin that you can enable by
+    selecting \gui Help > \gui {About Plugins} > \gui {Version Control} >
+    \gui ClearCase. The ClearCase client plugin is available on Linux and
+    Windows for accessing a ClearCase server.
+
+    The \gui ClearCase submenu contains the following additional items:
+
+    \table
+        \header
+            \o  Menu Item
+            \o  Description
+        \row
+            \o  \gui{Check In}
+            \o  Create a permanent new version of the current file or all files
+                in the versioned object base (VOB).
+        \row
+            \o  \gui{Check In Activity}
+            \o  Check in checked-out versions in the change set of the current
+                Unified Change Management (UCM) activity.
+        \row
+            \o  \gui{Check Out}
+            \o  Create a writable copy of a branch. If you check out files in a
+                UCM view, they are added to the change set of the UCM activity.
+        \row
+            \o  \gui{Undo Check Out}
+            \o  Cancel the checkout for a file and delete the checked-out
+                version.
+        \row
+            \o  \gui{Undo Hijack}
+            \o  Resolve hijacked files. If you change the read-only attribute of
+                a file that is loaded into a snapshot view and modify the file
+                without checking it out, you \e hijack the file.
+    \endtable
+
+\section2 Using Additional CVS Functions
 
     CVS is an open source version control system.
 

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

@@ -116,9 +116,10 @@
 
             \o  Qt Quick Application (Built-in Elements)
 
-                Use built-in QML elements to design Qt Quick based user
-                interfaces with a custom look and feel and QML and C++ code to
-                implement the application logic
+                Use built-in QML elements to design user interfaces based on
+                Qt Quick 1 (Qt 4.7.1, or later) or Qt Quick 2 (Qt 5) with a
+                custom look and feel and QML and C++ code to implement the
+                application logic
 
             \o  Qt Quick Application for MeeGo Harmattan
 

doc/src/qtquick/qtquick-creating.qdoc

@@ -50,6 +50,14 @@
             custom look and feel, whereas the components provide the look and
             feel for a particular platform.
 
+            The Qt Quick 1 Application wizard imports Qt Quick 1.1, and
+            therefore, you can use it without changes to develop for platforms
+            that run Qt 4.7.4 (such as MeeGo). To develop for platforms that run
+            Qt 4.7.3 (such as Maemo), you must change the import statement to
+            import Qt Quick 1.0.
+
+            The Qt Quick 2 Application wizard imports Qt Quick 2.0. Use it to
+            develop for platforms that run Qt 5.
         \o  \gui {Qt Quick UI} creates a Qt Quick UI project with a single QML
             file that contains the main view. You can review Qt Quick UI
             projects in the QML Viewer and you need not build them. You do not
@@ -68,16 +76,6 @@
 
     \endlist
 
-    \if defined(qcmanual)
-    \note Qt 4.7.3 supports Qt Quick 1.0 and Qt 4.7.4 supports Qt Quick 1.1. The
-    application wizards import Qt Quick 1.1, and therefore, you can use them
-    without changes if you target only platforms that run Qt 4.7.4 (such as
-    MeeGo or the desktop). If you also target platforms that run Qt 4.7.3
-    (such as Maemo), you must change the import statement to
-    import Qt Quick 1.0.
-    \endif
-
-
     \section1 Creating Qt Quick UI Projects
 
     \list 1