From c0589cde3d2d37191490d4421e8503568005682b Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Tue, 26 Jul 2011 10:06:45 +1000 Subject: Windows: fixed qtmain.lib not going to `lib' directory `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 Reviewed-by: Michael Goddard --- src/winmain/winmain.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro index b353e8e382..6630d86326 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -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 = -- cgit v1.2.3