Windows: fixed qtmain.lib not going to `lib' directory
authorRohan McGovern <rohan.mcgovern@nokia.com>
Tue, 26 Jul 2011 00:06:45 +0000 (10:06 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 26 Jul 2011 01:27:34 +0000 (03:27 +0200)
`load(qt_module_config)' clobbers DESTDIR.
Rearrange the order so that our setting of DESTDIR works as intended.

Change-Id: Id6f02e9fb55069fae9b2a75c9d0f51578b84f4d1
Reviewed-on: http://codereview.qt.nokia.com/2130
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
src/winmain/winmain.pro

index b353e8e..6630d86 100644 (file)
@@ -1,7 +1,6 @@
 # Additional Qt project file for qtmain lib on Windows
 TEMPLATE = lib
 TARGET  = qtmain
-DESTDIR         = $$QMAKE_LIBDIR_QT
 QT       =
 
 CONFIG += staticlib warn_on
@@ -17,5 +16,6 @@ win32 {
 
 !win32:error("$$_FILE_ is intended only for Windows!")
 load(qt_module_config)
+DESTDIR = $$QMAKE_LIBDIR_QT
 wince*:QMAKE_POST_LINK =