AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shrink #ifdef'd section

Browse Source 
for better compile-time coverage

Change-Id: I594303cca6f22b68f99c0f35e0767032b90c9eae
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-10-31 16:15:28 +01:00 committed by The Qt Project
parent 2129a3e2d2
commit 9dd2b32e9a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qmake/generators/win32/msvc_nmake.cpp
View File

@ -113,9 +113,7 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t)
qPrintable(variables["QMAKESPEC"].first().toQString()));
return false;
}
}
#ifdef Q_OS_WIN
else if (project->isActiveConfig(QStringLiteral("winrt"))) {
} else if (project->isActiveConfig(QStringLiteral("winrt"))) {
QString arch = project->first("VCPROJ_ARCH").toQString().toLower();
QString compiler;
QString compilerArch;
@ -126,6 +124,7 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t)
compiler = QStringLiteral("x86_amd64");
compilerArch = QStringLiteral("amd64");
}
#ifdef Q_OS_WIN
#ifdef Q_OS_WIN64
const QString regKey = QStringLiteral("Software\\Wow6432Node\\Microsoft\\VisualStudio\\11.0\\Setup\\VC\\ProductDir");
#else
@ -137,6 +136,9 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t)
"Is it installed?.\n");
return false;
}
#else
const QString vcInstallDir = "/fake/vc_install_dir";
#endif // Q_OS_WIN
QStringList incDirs;
QStringList libDirs;
@ -192,7 +194,6 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t)
t << "\nLIB = " << nmakePathList(libDirs);
t << "\nPATH = " << nmakePathList(binDirs) << '\n';
}
#endif // Q_OS_WIN
}
writeNmakeParts(t);
return MakefileGenerator::writeMakefile(t);