diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-10-31 16:15:28 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-04 19:50:02 +0100 |
commit | 9dd2b32e9aede824eed1fa37ef143a6421db04fe (patch) | |
tree | 426a2cb2979c7cdab8d2f48358cd5b6587186bc9 /qmake | |
parent | 2129a3e2d2dabb289230aa9af1e6fbf4af9f24ca (diff) |
shrink #ifdef'd section
for better compile-time coverage
Change-Id: I594303cca6f22b68f99c0f35e0767032b90c9eae
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index 3185e68ecc..37ba3a66ef 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -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); |