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

QmakeProjectManager: Fix typo in method name

Browse Source 
Change-Id: I63a1ca0c9fd4ef1a6af758179e315fc7ec96eeb4
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-02-20 14:39:30 +01:00
parent 86b5b5c2f3
commit 655eed467e
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -550,7 +550,7 @@ QStringList QmakeBuildConfiguration::extractDeducedArguments(QString *args)
return result; return result;
} }
QStringList QmakeBuildConfiguration::deduceArgumnetsForTargetAbi(const ProjectExplorer::Abi &targetAbi, const BaseQtVersion *version) QStringList QmakeBuildConfiguration::deduceArgumentsForTargetAbi(const ProjectExplorer::Abi &targetAbi, const BaseQtVersion *version)
{ {
QStringList arguments; QStringList arguments;
if ((targetAbi.os() == ProjectExplorer::Abi::MacOS) if ((targetAbi.os() == ProjectExplorer::Abi::MacOS)

2
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h
View File

@@ -97,7 +97,7 @@ public:
const QString &directory, const QtSupport::BaseQtVersion *version, const QString &directory, const QtSupport::BaseQtVersion *version,
QStringList *outArgs = 0); QStringList *outArgs = 0);
static QStringList extractDeducedArguments(QString *args); static QStringList extractDeducedArguments(QString *args);
static QStringList deduceArgumnetsForTargetAbi(const ProjectExplorer::Abi &targetAbi, const QtSupport::BaseQtVersion *version); static QStringList deduceArgumentsForTargetAbi(const ProjectExplorer::Abi &targetAbi, const QtSupport::BaseQtVersion *version);
QVariantMap toMap() const; QVariantMap toMap() const;

4
src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
View File

@@ -148,7 +148,7 @@ QList<BuildInfo *> QmakeProjectImporter::import(const FileName &importPath, bool
kitSpec = kitVersion->mkspecFor(tc); kitSpec = kitVersion->mkspecFor(tc);
QStringList kitDeducedArguments; QStringList kitDeducedArguments;
if (tc) if (tc)
kitDeducedArguments = QmakeBuildConfiguration::deduceArgumnetsForTargetAbi(tc->targetAbi(), kitVersion); kitDeducedArguments = QmakeBuildConfiguration::deduceArgumentsForTargetAbi(tc->targetAbi(), kitVersion);
if (kitVersion == version if (kitVersion == version
&& kitSpec == parsedSpec && kitSpec == parsedSpec
@@ -300,7 +300,7 @@ static ToolChain *preferredToolChain(BaseQtVersion *qtVersion, const FileName &m
[&spec, &deducedArguments, &qtAbis](ToolChain *tc) -> bool{ [&spec, &deducedArguments, &qtAbis](ToolChain *tc) -> bool{
return qtAbis.contains(tc->targetAbi()) return qtAbis.contains(tc->targetAbi())
&& tc->suggestedMkspecList().contains(spec) && tc->suggestedMkspecList().contains(spec)
&& QmakeBuildConfiguration::deduceArgumnetsForTargetAbi(tc->targetAbi(), 0) == deducedArguments; && QmakeBuildConfiguration::deduceArgumentsForTargetAbi(tc->targetAbi(), 0) == deducedArguments;
}); });
} }

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

@@ -177,7 +177,7 @@ QStringList QMakeStep::deducedArguments()
// explicitly add architecture to CONFIG // explicitly add architecture to CONFIG
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit()); QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit());
arguments << QmakeBuildConfiguration::deduceArgumnetsForTargetAbi(targetAbi, version); arguments << QmakeBuildConfiguration::deduceArgumentsForTargetAbi(targetAbi, version);
if (linkQmlDebuggingLibrary() && version && !useQtQuickCompiler()) { if (linkQmlDebuggingLibrary() && version && !useQtQuickCompiler()) {
arguments << QLatin1String(Constants::QMAKEVAR_QUICK1_DEBUG); arguments << QLatin1String(Constants::QMAKEVAR_QUICK1_DEBUG);
if (version->qtVersion().majorVersion >= 5) if (version->qtVersion().majorVersion >= 5)