diff options
| author | axis <qt-info@nokia.com> | 2009-11-06 14:44:39 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-06 14:44:39 (GMT) |
| commit | daf5f511ee813fc4fffba64bed558d0413270388 (patch) | |
| tree | 37fefb6189943606d184d2159577f7f2ce67b5db /mkspecs/common/symbian | |
| parent | 89b6de9091adbf0645ffe2aba59cb17cb233c170 (diff) | |
| parent | ded84966823eac0ae0275a2a7676d647d4d856ff (diff) | |
| download | Qt-daf5f511ee813fc4fffba64bed558d0413270388.zip Qt-daf5f511ee813fc4fffba64bed558d0413270388.tar.gz Qt-daf5f511ee813fc4fffba64bed558d0413270388.tar.bz2 | |
Merge branch '4.6-s60' into 4.6
Diffstat (limited to 'mkspecs/common/symbian')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 1acfefe..79bac42 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -50,17 +50,18 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< -QMAKE_LINK = g++ -QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl +QMAKE_LINK = +QMAKE_LFLAGS = +QMAKE_LFLAGS.ARMCC = +QMAKE_LFLAGS_EXCEPTIONS_ON = QMAKE_LFLAGS_EXCEPTIONS_OFF = -QMAKE_LFLAGS_RELEASE = -Wl,-s -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console -QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows -QMAKE_LFLAGS_DLL = -shared -QMAKE_LINK_OBJECT_MAX = 10 -QMAKE_LINK_OBJECT_SCRIPT= object_script +QMAKE_LFLAGS_RELEASE = +QMAKE_LFLAGS_DEBUG = +QMAKE_LFLAGS_CONSOLE = +QMAKE_LFLAGS_WINDOWS = +QMAKE_LFLAGS_DLL = +QMAKE_LINK_OBJECT_MAX = +QMAKE_LINK_OBJECT_SCRIPT= QMAKE_LIBS = -llibc -llibm -leuser -llibdl QMAKE_LIBS_CORE = $$QMAKE_LIBS -llibpthread -lefsrv |