diff options
| author | axis <qt-info@nokia.com> | 2011-03-14 11:40:58 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-03-14 11:40:58 +0100 |
| commit | d8aa0f54f8e6f5d2a95965203b7f60c11297dacf (patch) | |
| tree | 27421db20ab68dff072f0d9a7735742d20855993 /mkspecs/win32-g++ | |
| parent | 8f59ff17926e246ff732ce40890a3a7625b8e826 (diff) | |
| parent | d45c67d01ce28f4fb85eace1116ca751a8f02827 (diff) | |
| download | qt4-tools-d8aa0f54f8e6f5d2a95965203b7f60c11297dacf.tar.gz | |
Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7
Conflicts:
mkspecs/common/symbian/symbian.conf
Diffstat (limited to 'mkspecs/win32-g++')
| -rw-r--r-- | mkspecs/win32-g++/qmake.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index 65ae590cfc..da657276b6 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/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 = |