diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2014-11-27 19:36:17 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-05 14:26:52 +0000 |
| commit | a06f37c075d1d411d452e9ebcad83a6a3ccdcb42 (patch) | |
| tree | 20787b40cbad5bcd43e9f90ce60f238eb9aa6d21 | |
| parent | 6bb69b9b0e12fc83aa2acccd5cce1db4757d8aea (diff) | |
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 <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 12 |
1 files 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); } |