diff --git a/doc/images/qmldesigner-run-settings.png b/doc/images/qmldesigner-run-settings.png
index 3eff98e2901abde7f4545961f19f0a4980cdd155..0cd5d00d16e70ac54ac435ef20c13e75491ed57d 100644
Binary files a/doc/images/qmldesigner-run-settings.png and b/doc/images/qmldesigner-run-settings.png differ
diff --git a/doc/images/qtquick-debugging-settings.png b/doc/images/qtquick-debugging-settings.png
index 67420059f2043bd12a20fab2835acf20f6f233d4..c789bfa5c408739cdbb58baecd183f2559afe03c 100644
Binary files a/doc/images/qtquick-debugging-settings.png and b/doc/images/qtquick-debugging-settings.png differ
diff --git a/doc/src/debugger/qtquick-debugging.qdoc b/doc/src/debugger/qtquick-debugging.qdoc
index bbe89d6a2995b9a84b6be7a3d665315a8b18958a..942aa6ce8f578e42abeae0e9f3b3f079919371a8 100644
--- a/doc/src/debugger/qtquick-debugging.qdoc
+++ b/doc/src/debugger/qtquick-debugging.qdoc
@@ -54,8 +54,9 @@
 
     \list 1
 
-        \o  Select \gui Projects, and then select the \gui QML check box in the
-            \gui {Run Settings}, to enable QML debugging.
+        \o  In \gui Projects mode \gui {Run Settings}, select the
+            \gui {Enable QML} check box in the \gui {Debugger Settings} to
+            enable QML debugging.
 
         \o  For Qt 4.7, compile the QML Inspector debugging helper. For more information,
             see \l{Debugging Helpers for QML}.
@@ -82,7 +83,8 @@
             functions. Therefore, you must make sure that the port is properly
             protected by a firewall.
 
-        \o  In the \gui {Run Settings}, select the \gui QML check box to enable
+        \o  In the \gui {Run Settings}, \gui {Debugger Settings} section, select
+            the \gui {Enable QML} check box to enable
             QML debugging.
 
         \o  Select \gui {Build > Rebuild Project} to clean and rebuild the
@@ -98,7 +100,9 @@
     \section1 Mixed C++/QML Debugging
 
     To debug both the C++ and QML parts of your application at the same time,
-    select the checkboxes for both languages in the \gui{Run Settings}.
+    select the \gui {Enable C++} and \gui {Enable QML} checkboxes for both
+    languages in the \gui {Debugger Settings} section in the project
+    \gui{Run Settings}.
 
     \image qtquick-debugging-settings.png
 
diff --git a/doc/src/projects/creator-projects-settings-run-debug.qdocinc b/doc/src/projects/creator-projects-settings-run-debug.qdocinc
new file mode 100644
index 0000000000000000000000000000000000000000..6e488a4af507b9e7122e99f74a0553714bbd3b45
--- /dev/null
+++ b/doc/src/projects/creator-projects-settings-run-debug.qdocinc
@@ -0,0 +1,19 @@
+    \section2 Specifying Debugger Settings
+
+    \image qtquick-debugging-settings.png "Debugger Settings"
+
+    To select the languages to debug, select the \gui {Enable C++} and
+    \gui {Enable QML} check boxes. The \gui {Debug port} is the port to
+    communicate with the debugger. You can use any free port in the registered
+    or dynamic port range.
+
+    \note Opening a socket at a well-known port presents a security risk. Anyone
+    on the Internet could connect to the application that you are debugging and
+    execute any JavaScript functions. Therefore, you must make sure that the
+    port is properly protected by a firewall.
+
+    If you debug more than one application at a time, you might receive an error
+    message stating that the port is already in use. Specify a free port number
+    in \gui {Debug port} and try again.
+
+    For more information about debugging, see \l{Debugging}.
diff --git a/doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc b/doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc
index 309f3303fa84c2a4f1d39f8fbd037a05390a66b6..76caa4527a777eeb2e726ceb3580e1cfed6b8f84 100644
--- a/doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc
+++ b/doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc
@@ -13,16 +13,6 @@
         \o  In the \gui {Main QML file}, select the file that \QQV will be
             started with.
 
-        \o  In the \gui Debugger group, select the languages to debug:
-            \gui{C++} and \gui QML. \gui {Debug port} is the port to access
-            \QQV. You can use any free port in the registered port range.
-            For more information, see \l{Debugging Qt Quick Projects}.
-
     \endlist
 
-    \note Opening a socket at a well-known port presents a security risk. Anyone
-    on the Internet could connect to the application that you are debugging and
-    execute any JavaScript functions. Therefore, you must make sure that the
-    port is properly protected by a firewall.
-
     \image qmldesigner-run-settings.png "Run settings for Qt Quick UI projects"