diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-07-26 10:06:45 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-26 03:27:34 +0200 |
| commit | c0589cde3d2d37191490d4421e8503568005682b (patch) | |
| tree | b14a4406030cdcb2f6c380fb93c788a7b2e2e93a /src | |
| parent | 750147f5c9ab892f1892fe33718fc4c402f2f73c (diff) | |
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 <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/winmain/winmain.pro | 2 |
1 files changed, 1 insertions, 1 deletions
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 = |