Fixing Wec2013 qmake support for VS2013 SDKs.

SDKs generated from VS2013 use a different folder for
build settings than those generated from VS2012.
Check both folders, before rejecting a potential
SDK.

Change-Id: I5bee5cc3771352adaab07d39ebbc350618f6c573
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

1 files changed, 9 insertions, 6 deletions

diff --git a/qmake/generators/win32/cesdkhandler.cpp b/qmake/generators/win32/cesdkhandler.cpp
index 2b1df894ee..f8235bae27 100644
--- a/qmake/generators/win32/cesdkhandler.cpp
+++ b/qmake/generators/win32/cesdkhandler.cpp
@@ -179,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;
 }
@@ -287,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, &currentSdk);
+            retrieveEnvironment(currentProperty.properties.value(QLatin1String("MSBuild Files120")).value.split(';'),
+                                filteredToolPaths, &currentSdk);
             if (!currentSdk.m_include.isEmpty())
                 m_list.append(currentSdk);
         }