Merge remote-tracking branch 'origin/2.5'

34 files changed, 16 insertions, 12 deletions

diff --git a/doc/images/qml-export-gimp.png b/doc/images/qml-export-gimp.png
index 663bfa1171..5c78a4013b 100644
--- a/doc/images/qml-export-gimp.png
+++ b/doc/images/qml-export-gimp.png
diff --git a/doc/images/qml-export-photoshop.png b/doc/images/qml-export-photoshop.png
index 2c92b8ba8e..254c7dbef5 100644
--- a/doc/images/qml-export-photoshop.png
+++ b/doc/images/qml-export-photoshop.png
diff --git a/doc/images/qml-observer-buttons.png b/doc/images/qml-observer-buttons.png
deleted file mode 100644
index 919ff10991..0000000000
--- a/doc/images/qml-observer-buttons.png
+++ /dev/null
diff --git a/doc/images/qml-profiler-javascript.png b/doc/images/qml-profiler-javascript.png
index 65c281ba7f..b731eb5290 100644
--- a/doc/images/qml-profiler-javascript.png
+++ b/doc/images/qml-profiler-javascript.png
diff --git a/doc/images/qt-simulator.png b/doc/images/qt-simulator.png
index d426598c73..58e08fb19b 100644
--- a/doc/images/qt-simulator.png
+++ b/doc/images/qt-simulator.png
diff --git a/doc/images/qtcreator-analyze-menu.png b/doc/images/qtcreator-analyze-menu.png
index 04b289dcf7..3f90fa541d 100644
--- a/doc/images/qtcreator-analyze-menu.png
+++ b/doc/images/qtcreator-analyze-menu.png
diff --git a/doc/images/qtcreator-analyze-start-button.png b/doc/images/qtcreator-analyze-start-button.png
index a3c2c1553b..3c4ace726c 100644
--- a/doc/images/qtcreator-analyze-start-button.png
+++ b/doc/images/qtcreator-analyze-start-button.png
diff --git a/doc/images/qtcreator-analyzer-bindings.png b/doc/images/qtcreator-analyzer-bindings.png
index e4d3d18538..e9ce84b2bb 100644
--- a/doc/images/qtcreator-analyzer-bindings.png
+++ b/doc/images/qtcreator-analyzer-bindings.png
diff --git a/doc/images/qtcreator-analyzer-button.png b/doc/images/qtcreator-analyzer-button.png
index 07d5efecb2..1ba7ada5f2 100644
--- a/doc/images/qtcreator-analyzer-button.png
+++ b/doc/images/qtcreator-analyzer-button.png
diff --git a/doc/images/qtcreator-analyzer-stop-button.png b/doc/images/qtcreator-analyzer-stop-button.png
deleted file mode 100644
index 883b151a1b..0000000000
--- a/doc/images/qtcreator-analyzer-stop-button.png
+++ /dev/null
diff --git a/doc/images/qtcreator-batteryindicator-screenshot.png b/doc/images/qtcreator-batteryindicator-screenshot.png
deleted file mode 100644
index 5689a30c94..0000000000
--- a/doc/images/qtcreator-batteryindicator-screenshot.png
+++ /dev/null
diff --git a/doc/images/qtcreator-cmake-import-wizard1.png b/doc/images/qtcreator-cmake-import-wizard1.png
index 6c93ab9c98..9749ed9ffa 100644
--- a/doc/images/qtcreator-cmake-import-wizard1.png
+++ b/doc/images/qtcreator-cmake-import-wizard1.png
diff --git a/doc/images/qtcreator-cmake-import-wizard2.png b/doc/images/qtcreator-cmake-import-wizard2.png
index c05fd3b859..574bb9a055 100644
--- a/doc/images/qtcreator-cmake-import-wizard2.png
+++ b/doc/images/qtcreator-cmake-import-wizard2.png
diff --git a/doc/images/qtcreator-cmakeexecutable.png b/doc/images/qtcreator-cmakeexecutable.png
index 8a3e4b3e6d..70265cd230 100644
--- a/doc/images/qtcreator-cmakeexecutable.png
+++ b/doc/images/qtcreator-cmakeexecutable.png
diff --git a/doc/images/qtcreator-external-tools.png b/doc/images/qtcreator-external-tools.png
index 04b9c00b5a..cef5374f86 100644
--- a/doc/images/qtcreator-external-tools.png
+++ b/doc/images/qtcreator-external-tools.png
diff --git a/doc/images/qtcreator-help-add-bookmark-dlg.png b/doc/images/qtcreator-help-add-bookmark-dlg.png
index 8d4c6ea723..998060a81f 100644
--- a/doc/images/qtcreator-help-add-bookmark-dlg.png
+++ b/doc/images/qtcreator-help-add-bookmark-dlg.png
diff --git a/doc/images/qtcreator-help-add-bookmark.png b/doc/images/qtcreator-help-add-bookmark.png
index fb7429f535..8aefb6baf5 100644
--- a/doc/images/qtcreator-help-add-bookmark.png
+++ b/doc/images/qtcreator-help-add-bookmark.png
diff --git a/doc/images/qtcreator-help-filter-attributes.png b/doc/images/qtcreator-help-filter-attributes.png
index c5650eff48..35bd545c6d 100644
--- a/doc/images/qtcreator-help-filter-attributes.png
+++ b/doc/images/qtcreator-help-filter-attributes.png
diff --git a/doc/images/qtcreator-keyboard-shortcuts.png b/doc/images/qtcreator-keyboard-shortcuts.png
index ce9cba0d9e..00ca456fb8 100644
--- a/doc/images/qtcreator-keyboard-shortcuts.png
+++ b/doc/images/qtcreator-keyboard-shortcuts.png
diff --git a/doc/images/qtcreator-pin-tooltip.png b/doc/images/qtcreator-pin-tooltip.png
index d468b87e72..408273077d 100644
--- a/doc/images/qtcreator-pin-tooltip.png
+++ b/doc/images/qtcreator-pin-tooltip.png
diff --git a/doc/images/qtcreator-publishing-wizard-symbian.png b/doc/images/qtcreator-publishing-wizard-symbian.png
index 6edd9bf048..af6fce5b56 100644
--- a/doc/images/qtcreator-publishing-wizard-symbian.png
+++ b/doc/images/qtcreator-publishing-wizard-symbian.png
diff --git a/doc/images/qtcreator-qml-performance-monitor-toolbar.png b/doc/images/qtcreator-qml-performance-monitor-toolbar.png
deleted file mode 100644
index 4126eebffb..0000000000
--- a/doc/images/qtcreator-qml-performance-monitor-toolbar.png
+++ /dev/null
diff --git a/doc/images/qtcreator-qml-performance-monitor.png b/doc/images/qtcreator-qml-performance-monitor.png
index 44e056812c..6cd007d8e5 100644
--- a/doc/images/qtcreator-qml-performance-monitor.png
+++ b/doc/images/qtcreator-qml-performance-monitor.png
diff --git a/doc/images/qtcreator-symbian-components-example-simulated.png b/doc/images/qtcreator-symbian-components-example-simulated.png
index 14227bbbb0..1633a52d59 100644
--- a/doc/images/qtcreator-symbian-components-example-simulated.png
+++ b/doc/images/qtcreator-symbian-components-example-simulated.png
diff --git a/doc/images/qtcreator-symbian-components-example.png b/doc/images/qtcreator-symbian-components-example.png
index 7096b407bd..411204a990 100644
--- a/doc/images/qtcreator-symbian-components-example.png
+++ b/doc/images/qtcreator-symbian-components-example.png
diff --git a/doc/images/qtcreator-valgrind-callgrind-options.png b/doc/images/qtcreator-valgrind-callgrind-options.png
index d47c1b8ac9..eb7956c57b 100644
--- a/doc/images/qtcreator-valgrind-callgrind-options.png
+++ b/doc/images/qtcreator-valgrind-callgrind-options.png
diff --git a/doc/images/qtcreator-valgrind-callgrind.png b/doc/images/qtcreator-valgrind-callgrind.png
index fd7462b701..756c86e70d 100644
--- a/doc/images/qtcreator-valgrind-callgrind.png
+++ b/doc/images/qtcreator-valgrind-callgrind.png
diff --git a/doc/images/qtcreator-valgrind-memcheck-options.png b/doc/images/qtcreator-valgrind-memcheck-options.png
index 622b23c5fe..baca54ecf6 100644
--- a/doc/images/qtcreator-valgrind-memcheck-options.png
+++ b/doc/images/qtcreator-valgrind-memcheck-options.png
diff --git a/doc/images/qtcreator-valgrind-remote-settings.png b/doc/images/qtcreator-valgrind-remote-settings.png
index a801204d4e..cfacfc38a1 100644
--- a/doc/images/qtcreator-valgrind-remote-settings.png
+++ b/doc/images/qtcreator-valgrind-remote-settings.png
diff --git a/doc/images/remotecompiler-fn-logon.png b/doc/images/remotecompiler-fn-logon.png
index 4b3a42913b..2b55e6f81d 100644
--- a/doc/images/remotecompiler-fn-logon.png
+++ b/doc/images/remotecompiler-fn-logon.png
diff --git a/doc/src/analyze/creator-valgrind-overview.qdoc b/doc/src/analyze/creator-valgrind-overview.qdoc
index 1d606abadf..1755625c7e 100644
--- a/doc/src/analyze/creator-valgrind-overview.qdoc
+++ b/doc/src/analyze/creator-valgrind-overview.qdoc
@@ -33,7 +33,8 @@
 
     \title Using Valgrind Code Analysis Tools
 
-    \QC integrates Valgrind code analysis tools for detecting memory leaks and
+    \QC integrates \l{http://valgrind.org/info/tools.html}{Valgrind code
+    analysis tools} for detecting memory leaks and
     profiling function execution. You must download and install them separately
     to use them from \QC.
 
diff --git a/doc/src/analyze/creator-valgrind.qdoc b/doc/src/analyze/creator-valgrind.qdoc
index a7fec23e5d..c8a164f7b2 100644
--- a/doc/src/analyze/creator-valgrind.qdoc
+++ b/doc/src/analyze/creator-valgrind.qdoc
@@ -34,7 +34,7 @@
     \title Detecting Memory Leaks
 
     You can use the Memcheck tool included in the
-    \l{http://valgrind.org/info/tools.html}{Valgrind tool suite} to detect
+    Valgrind tool suite to detect
     problems that are related to memory management in applications.
 
     \note Memcheck is supported locally on Linux and Mac OS. You can run it on
@@ -60,7 +60,7 @@
         \o  Use the application to analyze it.
 
         \o  Select the
-            \inlineimage qtcreator-analyzer-stop-button.png "Stop button"
+            \inlineimage qtcreator-debug-button-stop.png "Stop button"
             button to view the results of the analysis in the
             \gui {Analysis} view.
 
@@ -151,7 +151,7 @@
         \o  Use the application to analyze it.
 
         \o  Select the
-            \inlineimage qtcreator-analyzer-stop-button.png "Stop button"
+            \inlineimage qtcreator-debug-button-stop.png "Stop button"
             button to view the results of the analysis in the \gui Profile
             view.
 
diff --git a/doc/src/analyze/qtquick-profiler.qdoc b/doc/src/analyze/qtquick-profiler.qdoc
index 782ea3062c..3ab3efd986 100644
--- a/doc/src/analyze/qtquick-profiler.qdoc
+++ b/doc/src/analyze/qtquick-profiler.qdoc
@@ -50,21 +50,24 @@
         \o  Select \gui {Analyze > QML Profiler} to profile the current
             application.
 
-        \o  Select the \gui Start button (1) to start the application from the
+        \o  Select the
+            \inlineimage qtcreator-analyze-start-button.png
+            (\gui Start) button to start the application from the
             QML Profiler.
 
-            \image qtcreator-qml-performance-monitor-toolbar.png "QML Profiler toolbar"
-
             \note If data collection does not start automatically, select the
-            \gui {Enable Profiling} button (3).
+            \inlineimage qtcreator-analyzer-button.png
+            (\gui {Enable Profiling}) button.
 
     \endlist
 
     When you start analyzing an application, the application is launched, and
     the QML Profiler immediately begins to collect data. This is indicated by
-    the time running in the \gui Elapsed field (4).
+    the time running in the \gui Elapsed field.
 
-    Data is collected until you select the \gui Stop button (2). Data collection
+    Data is collected until you select the
+    \inlineimage qtcreator-debug-button-stop.png
+    (\gui Stop) button. Data collection
     takes time, and therefore, there might be a delay
     before the data is displayed.
 
@@ -73,7 +76,7 @@
     The application continues to run for some seconds, after which it is stopped
     automatically. If you exit the application, the data is not sent.
 
-    Select the \gui {Disable Profiling} button (3) to disable the automatic
+    Select the \gui {Disable Profiling} button to disable the automatic
     start of the data collection when an
     application is launched. Data collection starts when you select the button
     again.
diff --git a/doc/src/howto/creator-external-tools.qdoc b/doc/src/howto/creator-external-tools.qdoc
index 14d9ef4e4f..a61c48d67f 100644
--- a/doc/src/howto/creator-external-tools.qdoc
+++ b/doc/src/howto/creator-external-tools.qdoc
@@ -97,7 +97,7 @@
     additional tools in \QC \gui Options.
 
     You can use \QC variables in the fields that you can select from
-    lists of available \QC variables.
+    lists of available \QC variables (1).
 
     \image qtcreator-external-tools.png "External Tools options"