diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-17 14:19:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-17 14:19:47 (GMT) |
| commit | f53a7044920409f57bc466631450dd77bea7b5b4 (patch) | |
| tree | fdf35b251602ef5b4515b20cb3df60212ac6c332 | |
| parent | 35abe608440f2effd330fd213955e391c4a412a2 (diff) | |
| parent | f087ad801b19ffa32a538269cd1475ead963f013 (diff) | |
| download | Qt-f53a7044920409f57bc466631450dd77bea7b5b4.zip Qt-f53a7044920409f57bc466631450dd77bea7b5b4.tar.gz Qt-f53a7044920409f57bc466631450dd77bea7b5b4.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qmake: fix assertion on Windows when DESTDIR is empty in static libs
| -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 c36cc9c..4944d06 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"); |