diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-08-26 09:31:27 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-08-26 09:31:27 (GMT) |
| commit | 69354f37173b7bfcf7ea0f37175a34b8766afcbb (patch) | |
| tree | d5d35fbb1c5b93470b6b1aa03c359ac09695055f /qmake/generators | |
| parent | 065610d14fda00057724a46e2649db6bb98aca58 (diff) | |
| parent | e5aa5a9d7e97b975316b8cc18554743cccf06474 (diff) | |
| download | Qt-69354f37173b7bfcf7ea0f37175a34b8766afcbb.zip Qt-69354f37173b7bfcf7ea0f37175a34b8766afcbb.tar.gz Qt-69354f37173b7bfcf7ea0f37175a34b8766afcbb.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
bin/syncqt
src/opengl/qgl.cpp
tools/configure/configureapp.cpp
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 64aaf34..ecb20c7 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -472,10 +472,13 @@ 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->isActiveConfig("staticlib")) - project->values("RES_FILE").first().prepend(fileInfo(project->values("DESTDIR").first()).absoluteFilePath() + Option::dir_sep); + QString resDestDir; + if (project->isActiveConfig("staticlib")) + resDestDir = fileInfo(project->first("DESTDIR")).absoluteFilePath(); else - project->values("RES_FILE").first().prepend(project->values("OBJECTS_DIR").first() + Option::dir_sep); + resDestDir = project->first("OBJECTS_DIR"); + resDestDir.append(Option::dir_sep); + project->values("RES_FILE").first().prepend(resDestDir); } project->values("RES_FILE").first() = Option::fixPathToTargetOS(project->values("RES_FILE").first(), false, false); project->values("POST_TARGETDEPS") += project->values("RES_FILE"); |