diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-12-09 17:37:45 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-01 17:22:01 (GMT) |
| commit | ec69e5ab5b74064feb88bc1f1096673227f51caa (patch) | |
| tree | 48072a80ae206dfa80b73345f3410e2905353af1 /qmake/generators/win32 | |
| parent | ac323ef4e9d018aa9df41d8f7e81b58a3e373dbf (diff) | |
| download | Qt-ec69e5ab5b74064feb88bc1f1096673227f51caa.zip Qt-ec69e5ab5b74064feb88bc1f1096673227f51caa.tar.gz Qt-ec69e5ab5b74064feb88bc1f1096673227f51caa.tar.bz2 | |
qmake: fix warnings
missing braces, parens and spaces denoting empty loop bodies
Reviewed-by: mariusSO
Diffstat (limited to 'qmake/generators/win32')
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index efdf8ac..9d3b4c6 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -467,11 +467,12 @@ void Win32MakefileGenerator::processRcFileVar() 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"); |