From a06f37c075d1d411d452e9ebcad83a6a3ccdcb42 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 27 Nov 2014 19:36:17 +0100 Subject: [PATCH] fix conditional nesting botch-up in RES_FILE construction it makes no sense to test for OBJECTS_DIR emptiness when we are going to use DESTDIR instead. Change-Id: I0f7115fc8a9fe2a996417d5f50bd0165773129fa Reviewed-by: Joerg Bornemann --- qmake/generators/win32/winmakefile.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 0255145b96..f3b955972d 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -515,12 +515,12 @@ void Win32MakefileGenerator::processRcFileVar() resFile.replace(".rc", Option::res_ext); project->values("RES_FILE").prepend(fileInfo(resFile).fileName()); - if (!project->values("OBJECTS_DIR").isEmpty()) { - QString resDestDir; - if (project->isActiveConfig("staticlib")) - resDestDir = project->first("DESTDIR").toQString(); - else - resDestDir = project->first("OBJECTS_DIR").toQString(); + QString resDestDir; + if (project->isActiveConfig("staticlib")) + resDestDir = project->first("DESTDIR").toQString(); + else + resDestDir = project->first("OBJECTS_DIR").toQString(); + if (!resDestDir.isEmpty()) { resDestDir.append(Option::dir_sep); project->values("RES_FILE").first().prepend(resDestDir); }