diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-09 16:05:49 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-09 16:05:49 (GMT) |
commit | ab620c451c30e05e8667ed9c8ec813c99738253d (patch) | |
tree | fe2718a9a071eae42923d035f7f156e75eb65494 /mkspecs | |
parent | 3b7b6b5192e943f13629b1790613ee8ae263eba3 (diff) | |
parent | 88b541095e2c818387996cac3590a612589b1253 (diff) | |
download | Qt-ab620c451c30e05e8667ed9c8ec813c99738253d.zip Qt-ab620c451c30e05e8667ed9c8ec813c99738253d.tar.gz Qt-ab620c451c30e05e8667ed9c8ec813c99738253d.tar.bz2 |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/unsupported/win32-g++-cross/qmake.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf index 01e2f10..0538e86 100644 --- a/mkspecs/unsupported/win32-g++-cross/qmake.conf +++ b/mkspecs/unsupported/win32-g++-cross/qmake.conf @@ -62,6 +62,8 @@ QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows QMAKE_LFLAGS_DLL = -shared QMAKE_LINK_OBJECT_MAX = 10 QMAKE_LINK_OBJECT_SCRIPT= object_script +QMAKE_PREFIX_STATICLIB = lib +QMAKE_EXTENSION_STATICLIB = a QMAKE_LIBS = |