diff --git a/doc/images/qml-link-debugging-library.png b/doc/images/qml-link-debugging-library.png index a6f11db9389..6a600c000df 100644 Binary files a/doc/images/qml-link-debugging-library.png and b/doc/images/qml-link-debugging-library.png differ diff --git a/doc/images/qml-observer-view.png b/doc/images/qml-observer-view.png index f75187ecfca..98a1100af43 100644 Binary files a/doc/images/qml-observer-view.png and b/doc/images/qml-observer-view.png differ diff --git a/doc/images/qml-script-console.png b/doc/images/qml-script-console.png index 08679a60b22..888df2c282d 100644 Binary files a/doc/images/qml-script-console.png and b/doc/images/qml-script-console.png differ diff --git a/doc/images/qtcreator-add-breakpoint.png b/doc/images/qtcreator-add-breakpoint.png index bf245728270..1a399df7b96 100644 Binary files a/doc/images/qtcreator-add-breakpoint.png and b/doc/images/qtcreator-add-breakpoint.png differ diff --git a/doc/images/qtcreator-debug-breakpoints.png b/doc/images/qtcreator-debug-breakpoints.png index f841626ad0a..7594830661c 100644 Binary files a/doc/images/qtcreator-debug-breakpoints.png and b/doc/images/qtcreator-debug-breakpoints.png differ diff --git a/doc/images/qtcreator-debug-stack.png b/doc/images/qtcreator-debug-stack.png index 7efa1a829e5..41288968092 100644 Binary files a/doc/images/qtcreator-debug-stack.png and b/doc/images/qtcreator-debug-stack.png differ diff --git a/doc/images/qtcreator-debugger-attach-to-process-not-yet-started.png b/doc/images/qtcreator-debugger-attach-to-process-not-yet-started.png index 3ef94c537ee..7ce406c2b19 100644 Binary files a/doc/images/qtcreator-debugger-attach-to-process-not-yet-started.png and b/doc/images/qtcreator-debugger-attach-to-process-not-yet-started.png differ diff --git a/doc/images/qtcreator-debugger-attach-to-running-debug-server.png b/doc/images/qtcreator-debugger-attach-to-running-debug-server.png index 1361886b13e..f991aa0cc3f 100644 Binary files a/doc/images/qtcreator-debugger-attach-to-running-debug-server.png and b/doc/images/qtcreator-debugger-attach-to-running-debug-server.png differ diff --git a/doc/images/qtcreator-debugger-attach-to-running.png b/doc/images/qtcreator-debugger-attach-to-running.png index a382405cfc2..6b44f7492fb 100644 Binary files a/doc/images/qtcreator-debugger-attach-to-running.png and b/doc/images/qtcreator-debugger-attach-to-running.png differ diff --git a/doc/images/qtcreator-debugger-cdb-paths.png b/doc/images/qtcreator-debugger-cdb-paths.png index 99ba352fa9f..5a320c576dd 100644 Binary files a/doc/images/qtcreator-debugger-cdb-paths.png and b/doc/images/qtcreator-debugger-cdb-paths.png differ diff --git a/doc/images/qtcreator-debugger-expressions.png b/doc/images/qtcreator-debugger-expressions.png index 84a3abbefd7..ef9e972071c 100644 Binary files a/doc/images/qtcreator-debugger-expressions.png and b/doc/images/qtcreator-debugger-expressions.png differ diff --git a/doc/images/qtcreator-debugger-load-core-file.png b/doc/images/qtcreator-debugger-load-core-file.png index b5b44f7a101..72b647d6cea 100644 Binary files a/doc/images/qtcreator-debugger-load-core-file.png and b/doc/images/qtcreator-debugger-load-core-file.png differ diff --git a/doc/images/qtcreator-debugger-start-external.png b/doc/images/qtcreator-debugger-start-external.png index c7b5c55a755..2dc7bff9414 100644 Binary files a/doc/images/qtcreator-debugger-start-external.png and b/doc/images/qtcreator-debugger-start-external.png differ diff --git a/doc/images/qtcreator-debugger-views.png b/doc/images/qtcreator-debugger-views.png index ec6fe7ca705..32e9257269e 100644 Binary files a/doc/images/qtcreator-debugger-views.png and b/doc/images/qtcreator-debugger-views.png differ diff --git a/doc/images/qtcreator-debugging-helper-options.png b/doc/images/qtcreator-debugging-helper-options.png index d4c635b0b8a..25a312f783a 100644 Binary files a/doc/images/qtcreator-debugging-helper-options.png and b/doc/images/qtcreator-debugging-helper-options.png differ diff --git a/doc/images/qtcreator-locals.png b/doc/images/qtcreator-locals.png index 81b407d9731..8907c5a4308 100644 Binary files a/doc/images/qtcreator-locals.png and b/doc/images/qtcreator-locals.png differ diff --git a/doc/images/qtcreator-setting-breakpoint1.png b/doc/images/qtcreator-setting-breakpoint1.png index cad33d2c17e..ebea460bee2 100644 Binary files a/doc/images/qtcreator-setting-breakpoint1.png and b/doc/images/qtcreator-setting-breakpoint1.png differ diff --git a/doc/images/qtcreator-setting-breakpoint2.png b/doc/images/qtcreator-setting-breakpoint2.png index d9d9d13cf40..24fd0053c27 100644 Binary files a/doc/images/qtcreator-setting-breakpoint2.png and b/doc/images/qtcreator-setting-breakpoint2.png differ diff --git a/doc/images/qtcreator-watcher.png b/doc/images/qtcreator-watcher.png index 97b150b5897..166bb902c2d 100644 Binary files a/doc/images/qtcreator-watcher.png and b/doc/images/qtcreator-watcher.png differ diff --git a/doc/images/qtquick-debugging-settings.png b/doc/images/qtquick-debugging-settings.png index 765d188bb8b..0b3d896ca1a 100644 Binary files a/doc/images/qtquick-debugging-settings.png and b/doc/images/qtquick-debugging-settings.png differ diff --git a/doc/images/qtquick-example-qml-inspector.png b/doc/images/qtquick-example-qml-inspector.png index 1f54b49ffb0..de9dd2222ae 100644 Binary files a/doc/images/qtquick-example-qml-inspector.png and b/doc/images/qtquick-example-qml-inspector.png differ diff --git a/doc/images/qtquick-example-setting-breakpoint1.png b/doc/images/qtquick-example-setting-breakpoint1.png index ae3a112f4a7..67da2556c72 100644 Binary files a/doc/images/qtquick-example-setting-breakpoint1.png and b/doc/images/qtquick-example-setting-breakpoint1.png differ diff --git a/doc/images/qtquick-example-setting-breakpoint2.png b/doc/images/qtquick-example-setting-breakpoint2.png index 0294e01ba10..788cacaf659 100644 Binary files a/doc/images/qtquick-example-setting-breakpoint2.png and b/doc/images/qtquick-example-setting-breakpoint2.png differ diff --git a/doc/images/qtquick-example-setting-breakpoint3.png b/doc/images/qtquick-example-setting-breakpoint3.png index fbe700f7e2c..5d197ff92ca 100644 Binary files a/doc/images/qtquick-example-setting-breakpoint3.png and b/doc/images/qtquick-example-setting-breakpoint3.png differ diff --git a/doc/images/qtquick-example-stack.png b/doc/images/qtquick-example-stack.png index 366485a951a..943b0af3d70 100644 Binary files a/doc/images/qtquick-example-stack.png and b/doc/images/qtquick-example-stack.png differ diff --git a/doc/images/samegame.png b/doc/images/samegame.png index faebd518deb..1a811dae185 100644 Binary files a/doc/images/samegame.png and b/doc/images/samegame.png differ diff --git a/doc/src/debugger/qtquick-debugger-example.qdoc b/doc/src/debugger/qtquick-debugger-example.qdoc index 51789173c5c..b07c8eb5756 100644 --- a/doc/src/debugger/qtquick-debugger-example.qdoc +++ b/doc/src/debugger/qtquick-debugger-example.qdoc @@ -87,7 +87,7 @@ \image qtquick-example-stack.png - \li Examine the local variables in the \uicontrol {Locals and Expressions} + \li Examine the local variables in the \uicontrol Locals view. Step through the code to see how the information changes in the view. @@ -105,8 +105,8 @@ \li To remove a breakpoint, right-click it and select \uicontrol {Delete Breakpoint}. - \li Select the \uicontrol {Locals and Expressions} tab to explore the object - structure at runtime: + \li In the \uicontrol Locals view, explore the object structure at + runtime. \image qtquick-example-qml-inspector.png @@ -115,11 +115,11 @@ \li Select \uicontrol Debug > \uicontrol Select to activate selection mode and then click the \uicontrol Menu button to move into the - \uicontrol menuButton component in the - \uicontrol {Locals and Expressions} view and the code editor. + \uicontrol menuButton component in the \uicontrol Locals view and + the code editor. - \li In the \uicontrol {Locals and Expressions} view, double-click the - value of a property to change it. + \li In the \uicontrol Locals view, double-click the value of a property + to change it. \endlist diff --git a/doc/src/debugger/qtquick-debugging.qdoc b/doc/src/debugger/qtquick-debugging.qdoc index 4f2dc30e93b..e237d4ad4a2 100644 --- a/doc/src/debugger/qtquick-debugging.qdoc +++ b/doc/src/debugger/qtquick-debugging.qdoc @@ -162,7 +162,7 @@ \li \l{Local Variables and Function Parameters} {Viewing local variables and function parameters} - \li \l{Inspecting Items}{Evaluating expressions at runtime} + \li \l{Evaluating Expressions} \endlist @@ -170,20 +170,21 @@ \include creator-debugger-common.qdocinc debugger-breakpoints \include creator-debugger-common.qdocinc debugger-call-stack-trace \include creator-debugger-common.qdocinc debugger-locals + \include creator-debugger-common.qdocinc debugger-expressions \endif \section1 Inspecting Items While the application is running, you can use the \uicontrol {Locals} - and \uicontrol{Expressions} views to explore the QML item structure. + view to explore the QML item structure. \image qml-observer-view.png "QML item tree" To keep the application visible while you interact with the debugger, select \uicontrol Debug > \uicontrol {Show Application on Top}. - You can view a QML item in \uicontrol {Locals} and \uicontrol {Expressions} - in the following ways: + You can view a QML item in the \uicontrol {Locals} view in the following + ways: \list