diff options
author | Ulf Hermann <[email protected]> | 2015-10-01 15:38:31 +0200 |
---|---|---|
committer | Ulf Hermann <[email protected]> | 2015-10-01 13:54:57 +0000 |
commit | 8db0a1b67147aca4454b396e2140ef69d59401a3 (patch) | |
tree | 39f05498e1f623f49aca6fa9ebaec7a2221e79c1 /src/plugins/qmakeprojectmanager/makefileparse.cpp | |
parent | b83ac9cc62ea03dde7a1f22f87396f2dfe042e58 (diff) |
Remove QtQuick1 debugging option from build & run settings
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 <[email protected]>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/makefileparse.cpp')
-rw-r--r-- | src/plugins/qmakeprojectmanager/makefileparse.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp index 3de2b6fcc2a..aaf3e1955e4 100644 --- a/src/plugins/qmakeprojectmanager/makefileparse.cpp +++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp @@ -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; |