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

qmake: Add support for Visual Studio 2017

Browse Source 
Change-Id: I21f56edca3852b52edd2c5fdcce76817141e8d4a
(cherry picked from qtbase/38675e18fcc841228141568a2ecfafdeb99eba2a)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Oliver Wolff
2016-11-17 10:40:44 +01:00
committed by Oswald Buddenhagen
parent ab23dce95f
commit 21b8eb121c
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -968,6 +968,13 @@ static ProString msvcBinDirToQMakeArch(QString subdir)
subdir = subdir.toLower(); subdir = subdir.toLower();
if (subdir == QLatin1String("amd64")) if (subdir == QLatin1String("amd64"))
return ProString("x86_64"); return ProString("x86_64");
// Since 2017 the folder structure from here is HostX64|X86/x64|x86
idx = subdir.indexOf(QLatin1Char('\\'));
if (idx == -1)
return ProString("x86");
subdir.remove(0, idx + 1);
if (subdir == QLatin1String("x64"))
return ProString("x86_64");
return ProString(subdir); return ProString(subdir);
} }
@@ -1062,8 +1069,12 @@ void QMakeEvaluator::loadDefaults()
vars[ProKey("QMAKE_HOST.arch")] << archStr; vars[ProKey("QMAKE_HOST.arch")] << archStr;
# if defined(Q_CC_MSVC) // ### bogus condition, but nobody x-builds for msvc with a different qmake # if defined(Q_CC_MSVC) // ### bogus condition, but nobody x-builds for msvc with a different qmake
// Since VS 2017 we need VCToolsInstallDir instead of VCINSTALLDIR
QString vcInstallDir = m_option->getEnv(QLatin1String("VCToolsInstallDir"));
if (vcInstallDir.isEmpty())
vcInstallDir = m_option->getEnv(QLatin1String("VCINSTALLDIR"));
vars[ProKey("QMAKE_TARGET.arch")] = msvcArchitecture( vars[ProKey("QMAKE_TARGET.arch")] = msvcArchitecture(
m_option->getEnv(QLatin1String("VCINSTALLDIR")), vcInstallDir,
m_option->getEnv(QLatin1String("PATH"))); m_option->getEnv(QLatin1String("PATH")));
# endif # endif
#elif defined(Q_OS_UNIX) #elif defined(Q_OS_UNIX)