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

Don't artificially prevent QML profiling

Browse Source 
The QtQuick compiler should not prevent QML profiling. However, in
this case it does prevent the QML debug options from getting added
to the qmake command line. This effectively prevents QML profiling.

Change-Id: I533d1bd3f9cc6e41bd42f285c32127286b20d85b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2015-02-19 17:20:27 +01:00
parent b96f014e86
commit a316948868
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,7 +178,7 @@ QStringList QMakeStep::deducedArguments()
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit()); QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit());
arguments << QmakeBuildConfiguration::deduceArgumentsForTargetAbi(targetAbi, version); arguments << QmakeBuildConfiguration::deduceArgumentsForTargetAbi(targetAbi, version);
if (linkQmlDebuggingLibrary() && version && !useQtQuickCompiler()) { if (linkQmlDebuggingLibrary() && version) {
arguments << QLatin1String(Constants::QMAKEVAR_QUICK1_DEBUG); arguments << QLatin1String(Constants::QMAKEVAR_QUICK1_DEBUG);
if (version->qtVersion().majorVersion >= 5) if (version->qtVersion().majorVersion >= 5)
arguments << QLatin1String(Constants::QMAKEVAR_QUICK2_DEBUG); arguments << QLatin1String(Constants::QMAKEVAR_QUICK2_DEBUG);