diff options
Diffstat (limited to 'qmake/generators/win32/cesdkhandler.cpp')
-rw-r--r-- | qmake/generators/win32/cesdkhandler.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/qmake/generators/win32/cesdkhandler.cpp b/qmake/generators/win32/cesdkhandler.cpp index cbee1d0dbd..f8235bae27 100644 --- a/qmake/generators/win32/cesdkhandler.cpp +++ b/qmake/generators/win32/cesdkhandler.cpp @@ -49,6 +49,7 @@ struct PropertyContainer QString value; QMap<QString, PropertyContainer> properties; }; +Q_DECLARE_TYPEINFO(PropertyContainer, Q_MOVABLE_TYPE); CeSdkInfo::CeSdkInfo() : m_major(0) , m_minor(0) { @@ -60,7 +61,7 @@ CeSdkHandler::CeSdkHandler() struct ContainsPathKey { - bool operator()(const QString &val) + bool operator()(const QString &val) const { return !(val.endsWith(QStringLiteral("MSBuildToolsPath")) || val.endsWith(QStringLiteral("MSBuildToolsRoot"))); @@ -69,8 +70,8 @@ struct ContainsPathKey struct ValueFromKey { - ValueFromKey(const QSettings *settings) : settings(settings){} - QString operator()(const QString &key) + explicit ValueFromKey(const QSettings *settings) : settings(settings) {} + QString operator()(const QString &key) const { return settings->value(key).toString(); } @@ -178,13 +179,14 @@ QStringList CeSdkHandler::filterMsBuildToolPaths(const QStringList &paths) const { QStringList result; foreach (const QString &path, paths) { - QDir dir(path); + QDir dirVC110(path); if (path.endsWith(QStringLiteral("bin"))) - dir.cdUp(); - if (dir.cd(QStringLiteral("Microsoft.Cpp\\v4.0\\V110\\Platforms")) - || dir.cd(QStringLiteral("Microsoft.Cpp\\v4.0\\V120\\Platforms"))) { - result << dir.absolutePath(); - } + dirVC110.cdUp(); + QDir dirVC120 = dirVC110; + if (dirVC110.cd(QStringLiteral("Microsoft.Cpp\\v4.0\\V110\\Platforms"))) + result << dirVC110.absolutePath(); + if (dirVC120.cd(QStringLiteral("Microsoft.Cpp\\v4.0\\V120\\Platforms"))) + result << dirVC120.absolutePath(); } return result; } @@ -286,6 +288,8 @@ void CeSdkHandler::retrieveWEC2013SDKs() currentSdk.m_minor = currentProperty.properties.value(QLatin1String("OSMinor")).value.toInt(); retrieveEnvironment(currentProperty.properties.value(QLatin1String("MSBuild Files110")).value.split(';'), filteredToolPaths, ¤tSdk); + retrieveEnvironment(currentProperty.properties.value(QLatin1String("MSBuild Files120")).value.split(';'), + filteredToolPaths, ¤tSdk); if (!currentSdk.m_include.isEmpty()) m_list.append(currentSdk); } |