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

QtSupport: Compile with QT_NO_CAST_FROM_ASCII

Browse Source 
Change-Id: I509e2280932477eed8ede5c9cf5d07305bb9ebdb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Orgad Shaneh
2012-07-05 11:06:03 +03:00
committed by Daniel Teske
parent 0b79002df4
commit eff2789348
5 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -893,15 +893,16 @@ void QMakeEvaluator::loadDefaults()
vars[ProString("QMAKE_HOST.arch")] << archStr;
# if defined(Q_CC_MSVC) // ### bogus condition, but nobody x-builds for msvc with a different qmake
QString paths = m_option->getEnv("PATH");
QString vcBin64 = m_option->getEnv("VCINSTALLDIR");
if (!vcBin64.endsWith('\\'))
vcBin64.append('\\');
vcBin64.append("bin\\amd64");
QString vcBinX86_64 = m_option->getEnv("VCINSTALLDIR");
if (!vcBinX86_64.endsWith('\\'))
vcBinX86_64.append('\\');
vcBinX86_64.append("bin\\x86_amd64");
QLatin1Char backslash('\\');
QString paths = m_option->getEnv(QLatin1String("PATH"));
QString vcBin64 = m_option->getEnv(QLatin1String("VCINSTALLDIR"));
if (!vcBin64.endsWith(backslash))
vcBin64.append(backslash);
vcBin64.append(QLatin1String("bin\\amd64"));
QString vcBinX86_64 = m_option->getEnv(QLatin1String("VCINSTALLDIR"));
if (!vcBinX86_64.endsWith(backslash))
vcBinX86_64.append(backslash);
vcBinX86_64.append(QLatin1String("bin\\x86_amd64"));
if (paths.contains(vcBin64, Qt::CaseInsensitive)
|| paths.contains(vcBinX86_64, Qt::CaseInsensitive))
vars[ProString("QMAKE_TARGET.arch")] << ProString("x86_64", NoHash);