diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-16 11:43:48 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-03 19:38:58 +0200 |
| commit | b2d574e83f66f63a520374c8e6536d12fa810acf (patch) | |
| tree | c61474c418d7cb2dbf4c62138ba5cc24b566ca74 /qmake | |
| parent | 001d4763b55b9146689c527334e923525bc41191 (diff) | |
remove unnecessary QMAKESPEC fallback code
QMAKESPEC is now always set
Change-Id: Ib3f7356a9260d42315747095e28db6604b2dcfe9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 2da1c8ecc8..9ca91f01c5 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -694,8 +694,6 @@ void VcprojGenerator::init() project->values("QMAKE_APP_FLAG").append("1"); else if (project->first("TEMPLATE") == "vclib") project->values("QMAKE_LIB_FLAG").append("1"); - if (project->values("QMAKESPEC").isEmpty()) - project->values("QMAKESPEC").append(qgetenv("QMAKESPEC")); project->values("QMAKE_L_FLAG") << "/LIBPATH:"; @@ -1121,9 +1119,6 @@ void VcprojGenerator::initDeploymentTool() if (!runtime.isEmpty() && (runtime != QLatin1String("no"))) { QString runtimeVersion = QLatin1String("msvcr"); QString mkspec = project->first("QMAKESPEC"); - // If no .qmake.cache has been found, we fallback to the original mkspec - if (mkspec.isEmpty()) - mkspec = project->first("QMAKESPEC_ORIGINAL"); if (!mkspec.isEmpty()) { if (mkspec.endsWith("2008")) |