Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
  WGL_COLOR_BITS_ARB should not take the alpha bits into account.
  Fix the broken unicode detection of ODBC driver.
  QNAM HTTP: Prepare a compression auto test related to a future bugfix
  fix Norwegian Breakfast Network warnings in configure
  fix shadow build of configure.exe
  fix epic fail from 4ba6646
  qmake: fix assertion on Windows when DESTDIR is empty in static libs
  Fix OpenGLVersionFlags on OpenGL 4.0 systems
  Update changes-4.6.4 with recent shader program changes
  Don't define highp/mediump/lowp if desktop GL has them
  QNAM HTTP: Fix crash related to aborted uploads
  QAudioOutput(ALSA); Fix check for available devices.

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");