diff --git a/doc/src/analyze/qtquick-profiler.qdoc b/doc/src/analyze/qtquick-profiler.qdoc
index 1f32124e975..a99f9e285e3 100644
--- a/doc/src/analyze/qtquick-profiler.qdoc
+++ b/doc/src/analyze/qtquick-profiler.qdoc
@@ -85,7 +85,7 @@
     \section1 Attaching to Running Qt Quick Applications
 
     To profile Qt Quick applications that are not launched by \QC, select
-    \uicontrol {Analyze > QML Profiler (External)}. You must enable QML debugging for
+    \uicontrol {Analyze > QML Profiler (External)}. You must enable QML debugging and profiling for
     the application in the project build settings. For more information, see
     \l{Setting Up QML Debugging}.
 
diff --git a/doc/src/debugger/qtquick-debugging.qdoc b/doc/src/debugger/qtquick-debugging.qdoc
index 418465b34f7..fc7d7723bec 100644
--- a/doc/src/debugger/qtquick-debugging.qdoc
+++ b/doc/src/debugger/qtquick-debugging.qdoc
@@ -50,8 +50,8 @@
 
         \li Debugging is enabled by default for Qt 4.8, or later. For Qt 4.7,
             select \uicontrol Projects, and then select the
-            \uicontrol {Enable QML debugging} check box in the \uicontrol qmake section
-            in \uicontrol {Build Steps}.
+            \uicontrol {Enable QML debugging and profiling} check box in the \uicontrol qmake
+            section in \uicontrol {Build Steps}.
 
             You might have to compile the library first, by selecting the
             \uicontrol Compile link.
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index d3a82f6b3d6..0febbaa95b9 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -653,17 +653,18 @@ void QMakeStepConfigWidget::updateQmlDebuggingOption()
 {
     QString warningText;
     bool supported = QtSupport::BaseQtVersion::isQmlDebuggingSupported(m_step->target()->kit(),
-                                                                     &warningText)
-            && !m_step->useQtQuickCompiler();
+                                                                       &warningText);
 
     m_ui->qmlDebuggingLibraryCheckBox->setEnabled(supported);
-    m_ui->debuggingLibraryLabel->setText(tr("Enable QML debugging:"));
+    m_ui->debuggingLibraryLabel->setText(tr("Enable QML debugging and profiling:"));
 
     if (supported && m_step->linkQmlDebuggingLibrary())
         warningText = tr("Might make your application vulnerable. Only use in a safe environment.");
 
     m_ui->qmlDebuggingWarningText->setText(warningText);
     m_ui->qmlDebuggingWarningIcon->setVisible(!warningText.isEmpty());
+
+    updateQtQuickCompilerOption(); // show or clear compiler warning text
 }
 
 void QMakeStepConfigWidget::updateQtQuickCompilerOption()
@@ -673,6 +674,10 @@ void QMakeStepConfigWidget::updateQtQuickCompilerOption()
                                                                           &warningText);
     m_ui->qtQuickCompilerCheckBox->setEnabled(supported);
     m_ui->qtQuickCompilerLabel->setText(tr("Enable Qt Quick Compiler:"));
+
+    if (supported && m_step->useQtQuickCompiler() && m_step->linkQmlDebuggingLibrary())
+        warningText = tr("Disables QML debugging. QML profiling will still work.");
+
     m_ui->qtQuickCompilerWarningText->setText(warningText);
     m_ui->qtQuickCompilerWarningIcon->setVisible(!warningText.isEmpty());
 }