diff options
author | Tobias Koenig <tobias.koenig@kdab.com> | 2017-02-09 17:33:12 +0100 |
---|---|---|
committer | Tobias Koenig <tobias.koenig@kdab.com> | 2017-02-10 17:14:10 +0000 |
commit | aad7e9551573ddf16bfba7a07ce6e24d92dc5483 (patch) | |
tree | 8e41ff6ebbe10d40ef5714221472791d4dbc29ce /qmake | |
parent | 3e43ddd926fd1d96a5d03b272119e02aef54aee9 (diff) |
Fix detection of WinCE SDKs with MSVC2015
Add 'V140' to the list of search directories, that is where
MSVC2015 installs the WinCE SDKs to.
Change-Id: If7bbc6a8d58b49b9ee8c27159a96d445e74b8dab
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/win32/cesdkhandler.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/qmake/generators/win32/cesdkhandler.cpp b/qmake/generators/win32/cesdkhandler.cpp index 8934bbd95f..7f8f5df743 100644 --- a/qmake/generators/win32/cesdkhandler.cpp +++ b/qmake/generators/win32/cesdkhandler.cpp @@ -183,10 +183,13 @@ QStringList CeSdkHandler::filterMsBuildToolPaths(const QStringList &paths) const if (path.endsWith(QLatin1String("bin"))) dirVC110.cdUp(); QDir dirVC120 = dirVC110; + QDir dirVC140 = 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(); + if (dirVC140.cd(QStringLiteral("Microsoft.Cpp\\v4.0\\V140\\Platforms"))) + result << dirVC140.absolutePath(); } return result; } @@ -290,6 +293,8 @@ void CeSdkHandler::retrieveWEC2013SDKs() filteredToolPaths, ¤tSdk); retrieveEnvironment(currentProperty.properties.value(QLatin1String("MSBuild Files120")).value.split(';'), filteredToolPaths, ¤tSdk); + retrieveEnvironment(currentProperty.properties.value(QLatin1String("MSBuild Files140")).value.split(';'), + filteredToolPaths, ¤tSdk); if (!currentSdk.m_include.isEmpty()) m_list.append(currentSdk); } |