diff options
| author | axis <qt-info@nokia.com> | 2009-07-03 13:19:59 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-23 14:51:17 (GMT) |
| commit | 2c55bc4a770fccc155bc97c9c55f9bc9871df246 (patch) | |
| tree | d132f1bc33b70b556310754bf04e18786ae78cf2 | |
| parent | 4810fceb88f9a39195b4cfe97315756f8a166fb0 (diff) | |
| download | Qt-2c55bc4a770fccc155bc97c9c55f9bc9871df246.zip Qt-2c55bc4a770fccc155bc97c9c55f9bc9871df246.tar.gz Qt-2c55bc4a770fccc155bc97c9c55f9bc9871df246.tar.bz2 | |
Enabled static lib creation using armar.
s60main now links!
| -rw-r--r-- | mkspecs/common/armcc.conf | 3 | ||||
| -rw-r--r-- | mkspecs/symbian/linux-armcc/qmake.conf | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/common/armcc.conf b/mkspecs/common/armcc.conf index f051f5c..fa2a935 100644 --- a/mkspecs/common/armcc.conf +++ b/mkspecs/common/armcc.conf @@ -35,3 +35,6 @@ QMAKE_LFLAGS_SHLIB += -shared QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_THREAD += +QMAKE_AR = armar --create +QMAKE_RANLIB = + diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf index 701390f..2d43b4a 100644 --- a/mkspecs/symbian/linux-armcc/qmake.conf +++ b/mkspecs/symbian/linux-armcc/qmake.conf @@ -14,9 +14,6 @@ load(qt_config) QMAKE_MOC = $$[QT_INSTALL_BINS]/moc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic -QMAKE_AR = ar cqs -QMAKE_RANLIB = - QMAKE_TAR = tar -cf QMAKE_GZIP = gzip -9f |