diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2011-11-15 15:56:11 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2011-11-15 16:00:36 +0100 |
| commit | c86116da26f77e3c3f79749ba1f4ae1fea393b71 (patch) | |
| tree | 6936928cb78980320b6236277f0bc6b40c958c8c | |
| parent | 7a8b2caef41ec04c3c32fc41837d83b5dfc8fced (diff) | |
| download | qt-creator-c86116da26f77e3c3f79749ba1f4ae1fea393b71.tar.gz | |
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
| -rw-r--r-- | src/plugins/qt4projectmanager/qmakestep.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index c0c932f45f..7ea921ec58 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; |