feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove QtQuick1 debugging option from build & run settings

Browse Source 
We don't need to support QtQuick1 anymore. Consequently, the
minimum Qt version for QML debugging is bumped to 5.0.0.

Change-Id: I9528de3f6869fb391eaf9560a148e03f6067b9de
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2015-10-01 15:38:31 +02:00
parent b83ac9cc62
commit 8db0a1b671
5 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmakeprojectmanager/makefileparse.cpp
View File

@@ -190,11 +190,6 @@ void MakeFileParse::parseAssignments(QList<QMakeAssignment> *assignments)
m_config.osType = QMakeStepConfig::IphoneOS;
else
m_config.osType = QMakeStepConfig::NoOsType;
} else if (value == QLatin1String("declarative_debug")) {
if (qa.op == QLatin1String("+="))
m_config.linkQmlDebuggingQQ1 = true;
else
m_config.linkQmlDebuggingQQ1 = false;
} else if (value == QLatin1String("qml_debug")) {
if (qa.op == QLatin1String("+="))
m_config.linkQmlDebuggingQQ2 = true;
@@ -329,7 +324,6 @@ MakeFileParse::MakeFileParse(const QString &makefile)
qCDebug(logging()) << " Explicit NoBuildAll" << m_qmakeBuildConfig.explicitNoBuildAll;
qCDebug(logging()) << " TargetArch" << m_config.archConfig;
qCDebug(logging()) << " OsType" << m_config.osType;
qCDebug(logging()) << " LinkQmlDebuggingQQ1" << m_config.linkQmlDebuggingQQ1;
qCDebug(logging()) << " LinkQmlDebuggingQQ2" << m_config.linkQmlDebuggingQQ2;
qCDebug(logging()) << " Qt Quick Compiler" << m_config.useQtQuickCompiler;
qCDebug(logging()) << " Separate Debug Info" << m_config.separateDebugInfo;