From c86116da26f77e3c3f79749ba1f4ae1fea393b71 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Tue, 15 Nov 2011 15:56:11 +0100
Subject: [PATCH] QML Debugging: Always name qmake step "Enable QML debugging"
We used to differ between Qt 4.7, where the step was "Link QML debugging
library", and 4.8. Let's just call the checkbox "Enable QML debugging"
for all Qt versions, which is easier to document.
Change-Id: I9bdffd75769a9d3c08efbf7471e00be46c9d9ed7
Task-number: QTCREATORBUG-6541
---
src/plugins/qt4projectmanager/qmakestep.cpp | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index c0c932f45f1..7ea921ec589 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -706,10 +706,7 @@ void QMakeStepConfigWidget::updateQmlDebuggingOption()
m_ui->qmlDebuggingLibraryCheckBox->setEnabled(m_step->isQmlDebuggingLibrarySupported());
QtSupport::BaseQtVersion *qtVersion = m_step->qt4BuildConfiguration()->qtVersion();
- if (!qtVersion || !qtVersion->needsQmlDebuggingLibrary())
- m_ui->debuggingLibraryLabel->setText(tr("Enable QML debugging:"));
- else
- m_ui->debuggingLibraryLabel->setText(tr("Link QML debugging library:"));
+ m_ui->debuggingLibraryLabel->setText(tr("Enable QML debugging:"));
QString warningText;
--
GitLab