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

remove unnecessary QMAKESPEC fallback code

Browse Source 
QMAKESPEC is now always set

Change-Id: Ib3f7356a9260d42315747095e28db6604b2dcfe9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-08-16 11:43:48 +02:00 committed by Qt by Nokia
parent 001d4763b5
commit b2d574e83f
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qmake/generators/win32/msvc_vcproj.cpp
View File

@ -694,8 +694,6 @@ void VcprojGenerator::init()
project->values("QMAKE_APP_FLAG").append("1"); project->values("QMAKE_APP_FLAG").append("1");
else if (project->first("TEMPLATE") == "vclib") else if (project->first("TEMPLATE") == "vclib")
project->values("QMAKE_LIB_FLAG").append("1"); project->values("QMAKE_LIB_FLAG").append("1");
if (project->values("QMAKESPEC").isEmpty())
project->values("QMAKESPEC").append(qgetenv("QMAKESPEC"));
project->values("QMAKE_L_FLAG") << "/LIBPATH:"; project->values("QMAKE_L_FLAG") << "/LIBPATH:";
@ -1121,9 +1119,6 @@ void VcprojGenerator::initDeploymentTool()
if (!runtime.isEmpty() && (runtime != QLatin1String("no"))) { if (!runtime.isEmpty() && (runtime != QLatin1String("no"))) {
QString runtimeVersion = QLatin1String("msvcr"); QString runtimeVersion = QLatin1String("msvcr");
QString mkspec = project->first("QMAKESPEC"); 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.isEmpty()) {
if (mkspec.endsWith("2008")) if (mkspec.endsWith("2008"))