diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-04 17:37:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-04 17:37:59 (GMT) |
| commit | 8dde027451601ff82793a0f4f146ec0ae5932893 (patch) | |
| tree | e2a5d8f53feea5ebbd28a3491a5a8110c137545a | |
| parent | 210399ea6ec35fe1e261d2d40bc23f5de3234013 (diff) | |
| parent | d5caf208ae0e87ed1f2706aba8db7e6395fd156c (diff) | |
| download | Qt-8dde027451601ff82793a0f4f146ec0ae5932893.zip Qt-8dde027451601ff82793a0f4f146ec0ae5932893.tar.gz Qt-8dde027451601ff82793a0f4f146ec0ae5932893.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Symbian/gcce: Remove the useless -T flag
| -rw-r--r-- | mkspecs/symbian-gcce/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/symbian-gcce/qmake.conf b/mkspecs/symbian-gcce/qmake.conf index 38042e9..c1a41b9 100644 --- a/mkspecs/symbian-gcce/qmake.conf +++ b/mkspecs/symbian-gcce/qmake.conf @@ -55,7 +55,7 @@ QMAKE_LFLAGS_APP += --entry=_E32Startup -u _E32Startup QMAKE_LFLAGS_SHLIB += -shared --default-symver --entry=_E32Dll -u _E32Dll QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB -gcceExtraFlags = --include=$${EPOCROOT}epoc32/include/gcce/gcce.h -march=armv5t -mapcs -mthumb-interwork -nostdinc -c -msoft-float -T script +gcceExtraFlags = --include=$${EPOCROOT}epoc32/include/gcce/gcce.h -march=armv5t -mapcs -mthumb-interwork -nostdinc -c -msoft-float QMAKE_CFLAGS += $${gcceExtraFlags} QMAKE_CXXFLAGS += $${gcceExtraFlags} -x c++ -fexceptions -fno-unit-at-a-time -fvisibility-inlines-hidden -Os #If we are not going to link to Qt or qtmain.lib, we need to include this at least once. |