diff options
| author | Daniel Teske <daniel.teske@nokia.com> | 2012-05-03 16:15:38 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@nokia.com> | 2012-05-03 16:27:55 +0200 |
| commit | 1a9b436cc169ad5201978333d46d781217940229 (patch) | |
| tree | f802deb06aa3ba5dce82f9aebac4b12f0c6fd3e6 /src/plugins/qt4projectmanager/qmakestep.cpp | |
| parent | aef919b31cef5d107b1160dc7fe606bd85dbbd34 (diff) | |
| download | qt-creator-1a9b436cc169ad5201978333d46d781217940229.tar.gz | |
Qt4ProjectManager: Cleanup TODOs
Change-Id: I3c274c5b9aa37e14d74da3276d7012983f14fc89
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/qmakestep.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/qmakestep.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index 9e8b3569aa..365be43db7 100644 --- a/src/plugins/qt4projectmanager/qmakestep.cpp +++ b/src/plugins/qt4projectmanager/qmakestep.cpp @@ -152,13 +152,13 @@ QString QMakeStep::allArguments(bool shorted) // Find out what flags we pass on to qmake arguments << bc->configCommandLineArguments(); - arguments << moreArguments(); + arguments << deducedArguments(); QString args = Utils::QtcProcess::joinArgs(arguments); // User arguments Utils::QtcProcess::addArgs(&args, m_userArgs); // moreArgumentsAfter - foreach (const QString &arg, moreArgumentsAfter()) + foreach (const QString &arg, deducedArgumentsAfter()) Utils::QtcProcess::addArg(&args, arg); return args; } @@ -167,7 +167,7 @@ QString QMakeStep::allArguments(bool shorted) /// moreArguments, /// -unix for Maemo /// QMAKE_VAR_QMLJSDEBUGGER_PATH -QStringList QMakeStep::moreArguments() +QStringList QMakeStep::deducedArguments() { Qt4BuildConfiguration *bc = qt4BuildConfiguration(); QStringList arguments; @@ -223,7 +223,7 @@ QStringList QMakeStep::moreArguments() } /// -after OBJECTS_DIR, MOC_DIR, UI_DIR, RCC_DIR -QStringList QMakeStep::moreArgumentsAfter() +QStringList QMakeStep::deducedArgumentsAfter() { Qt4BuildConfiguration *bc = qt4BuildConfiguration(); if (bc->qtVersion() && !bc->qtVersion()->supportsShadowBuilds()) { |