Merge remote-tracking branch 'origin/2.6'

Conflicts:
	src/libs/utils/tooltip/tips.cpp
	src/plugins/coreplugin/versiondialog.cpp
	src/plugins/projectexplorer/kitinformationconfigwidget.cpp
	src/plugins/qnx/blackberryapplicationrunner.cpp
	src/plugins/qnx/blackberrydeployconfiguration.cpp
	src/plugins/qnx/blackberrydeployconfiguration.h
	src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp

Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b

4 files changed, 23 insertions, 17 deletions

diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf
index 2d32655edf..e0eb7ce797 100644
--- a/doc/config/qtcreator-project.qdocconf
+++ b/doc/config/qtcreator-project.qdocconf
@@ -5,7 +5,8 @@ headerdirs =
 sourcedirs = $SRCDIR/src
 imagedirs = $SRCDIR/images $SRCDIR/templates/images
 outputdir = $OUTDIR
-exampledirs = $SRCDIR/examples
+exampledirs = $SRCDIR/examples \
+              $SRCDIR/snippets
 indexes                 = qt.index
 
 include(compat.qdocconf)
diff --git a/doc/images/qtcreator-run-settings-linux.png b/doc/images/qtcreator-run-settings-linux.png
new file mode 100755
index 0000000000..dc609f9d68
--- /dev/null
+++ b/doc/images/qtcreator-run-settings-linux.png
diff --git a/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc b/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc
index 5cec581486..9ba37324d1 100644
--- a/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc
+++ b/doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc
@@ -1,17 +1,11 @@
     \section2 Specifying Run Settings for Linux-Based Devices
 
-    To run an application on a Linux-based device (embedded Linux, MeeGo
-    Harmattan, or Maemo), create and select a device configuration in the
-    \l{glossary-buildandrun-kit}{kit} that is used for building and running the project and set its
-    device type correspondingly.
-    You can also pass command line arguments to your application.
-
-    \image qtcreator-screenshot-run-settings-maemo.png "Run settings for Linux-based devices"
-
-    To run and debug applications on Linux-based devices, you must
-    create connections from the development PC to the devices. Click
-    \gui {Manage device configurations} to create connections. For more
-    information, see \l{Configuring Connections to Maemo Devices},
+    To run and debug an application on a Linux-based device (embedded Linux,
+    MeeGo Harmattan, or Maemo), you must create connections from the development
+    host to the device and add the device configurations to
+    \l{glossary-buildandrun-kit}{kits}. Click \gui {Manage Kits} to add devices
+    to kits. For more information, see
+    \l{Configuring Connections to Maemo Devices},
     \l{Configuring Connections to Harmattan Devices}, and
     \l {Connecting Embedded Linux Devices}.
 
@@ -23,3 +17,14 @@
     on devices that are of the same type and run the same firmware as the
     connected device. For more information, see
     \l{Deploying Applications to Linux-Based Devices}.
+
+    For generic embedded Linux devices, the run settings display the path to the
+    executable file on the development host and on the device. To specify that
+    another application launches your application, for example, enter the
+    command in the \gui {Alternate executable on device} field and select the
+    \gui {Use this command instead} check box.
+
+    \image qtcreator-run-settings-linux.png "Run settings for Linux-based devices"
+
+    You can specify command line arguments to pass to your application in the
+    \gui Arguments field.
diff --git a/doc/src/qtquick/qtquick-app-tutorial.qdoc b/doc/src/qtquick/qtquick-app-tutorial.qdoc
index 225ade41e7..45e79d8ba1 100644
--- a/doc/src/qtquick/qtquick-app-tutorial.qdoc
+++ b/doc/src/qtquick/qtquick-app-tutorial.qdoc
@@ -293,7 +293,7 @@
             expressions for the x and y properties, as illustrated by the
             following code snippet:
 
-            \snippet snippets/qml/states-properties.qml states
+            \snippet qml/states-properties.qml states
 
             \image qmldesigner-tutorial-state1.png "States"
 
@@ -319,7 +319,7 @@
             moving to State1, the x and y coordinates of the Qt logo change
             linearly over a duration of 1 second:
 
-            \snippet snippets/qml/list-of-transitions.qml first transition
+            \snippet qml/list-of-transitions.qml first transition
 
         \o  You can use the Qt Quick toolbar for animation to change the easing
             curve type from linear to OutBounce:
@@ -342,13 +342,13 @@
             and y coordinates of the Qt logo change over a duration of 2
             seconds, and an InOutQuad easing function is used:
 
-            \snippet snippets/qml/list-of-transitions.qml second transition
+            \snippet qml/list-of-transitions.qml second transition
 
         \o  Add the following code to specify that for any other state changes,
             the x and y coordinates of the Qt logo change linearly over a
             duration of 200 milliseconds:
 
-            \snippet snippets/qml/list-of-transitions.qml default transition
+            \snippet qml/list-of-transitions.qml default transition
 
         \o  Press \key {Ctrl+R} to run the application.