From b2d574e83f66f63a520374c8e6536d12fa810acf Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 16 Aug 2012 11:43:48 +0200 Subject: remove unnecessary QMAKESPEC fallback code QMAKESPEC is now always set Change-Id: Ib3f7356a9260d42315747095e28db6604b2dcfe9 Reviewed-by: Daniel Teske Reviewed-by: Joerg Bornemann --- qmake/generators/win32/msvc_vcproj.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'qmake/generators') 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")) -- cgit v1.2.3