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

fix conditional nesting botch-up in RES_FILE construction

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2014-11-27 19:36:17 +01:00
parent 6bb69b9b0e
commit a06f37c075
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qmake/generators/win32/winmakefile.cpp
View File

@ -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);
}