qmake/generators/win32/winmakefile.cpp
branchRCL_3
changeset 5 d3bac044e0f0
parent 4 3b1da2848fc7
child 8 3f74d0d4af4c
--- a/qmake/generators/win32/winmakefile.cpp	Fri Feb 19 23:40:16 2010 +0200
+++ b/qmake/generators/win32/winmakefile.cpp	Fri Mar 12 15:46:37 2010 +0200
@@ -470,11 +470,12 @@
 
         resFile.replace(".rc", Option::res_ext);
         project->values("RES_FILE").prepend(fileInfo(resFile).fileName());
-        if (!project->values("OBJECTS_DIR").isEmpty())
+        if (!project->values("OBJECTS_DIR").isEmpty()) {
             if(project->isActiveConfig("staticlib"))
                 project->values("RES_FILE").first().prepend(fileInfo(project->values("DESTDIR").first()).absoluteFilePath() + Option::dir_sep);
             else
               project->values("RES_FILE").first().prepend(project->values("OBJECTS_DIR").first() + Option::dir_sep);
+        }
         project->values("RES_FILE").first() = Option::fixPathToTargetOS(project->values("RES_FILE").first(), false, false);
 	project->values("POST_TARGETDEPS") += project->values("RES_FILE");
         project->values("CLEAN_FILES") += project->values("RES_FILE");