1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: fixed qtmain.lib not going to `lib' directory

Browse Source 
`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>
This commit is contained in:
Rohan McGovern 2011-07-26 10:06:45 +10:00 committed by Qt by Nokia
parent 750147f5c9
commit c0589cde3d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/winmain/winmain.pro
View File

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