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

9
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -169,11 +169,8 @@ QMakeStepConfig QMakeStep::deducedArguments()
config.archConfig = QMakeStepConfig::targetArchFor(targetAbi, version);
config.osType = QMakeStepConfig::osTypeFor(targetAbi, version);
if (linkQmlDebuggingLibrary() && version) {
config.linkQmlDebuggingQQ1 = true;
if (version->qtVersion().majorVersion >= 5)
config.linkQmlDebuggingQQ2 = true;
}
if (linkQmlDebuggingLibrary() && version && version->qtVersion().majorVersion >= 5)
config.linkQmlDebuggingQQ2 = true;
if (useQtQuickCompiler() && version)
config.useQtQuickCompiler = true;
@@ -868,8 +865,6 @@ QStringList QMakeStepConfig::toArguments() const
else if (osType == IphoneOS)
arguments << QLatin1String("CONFIG+=iphoneos");
if (linkQmlDebuggingQQ1)
arguments << QLatin1String("CONFIG+=declarative_debug");
if (linkQmlDebuggingQQ2)
arguments << QLatin1String("CONFIG+=qml_debug");