diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-12 10:37:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-12 10:37:40 (GMT) |
| commit | 47760d59d57f548d5816ae43e456c86e01146491 (patch) | |
| tree | 059cc6290eabbd25ade0d3d8e40e2bc00ede5a79 /mkspecs/symbian | |
| parent | b4c589868f278aa9a58ab9afa727dbf0a9442e22 (diff) | |
| parent | a81cc0add7f9517dfbd31bb9988ab6bdc08c2b96 (diff) | |
| download | Qt-47760d59d57f548d5816ae43e456c86e01146491.zip Qt-47760d59d57f548d5816ae43e456c86e01146491.tar.gz Qt-47760d59d57f548d5816ae43e456c86e01146491.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: (24 commits)
Provide a way to specify the final sis name with createpackage/make sis
Update DEF files for Qt 4.7
Symbian/trk: Fix debugging output for the N8.
Add license header
Fix slider stepping when used with keypad navigation
fix webkit crash when accessing network on Symbian
Remove test cases which cause stack overflow
Fix compile errors
Run autotests with minimal capabilities
Documentation updates for Qt/Symbian on Linux development
Allow EPOCROOT env var to be without trailing slash.
Workaround for Symbian Open C bug in socket connect.
Fix fetchedRoot test variable to work also in Symbian
Add configure time checks for symbian environment
Check for existance of sis file parameter to runonphone
Fix thread synchronization issues in Symbian QFileSystemWatcher
Disable compiling of the plugin when extra package not found
Added missing UID3 for qsymbianbearer.dll.
Enabled previously disabled Qt features.
Fix includes so it compiles
...
Diffstat (limited to 'mkspecs/symbian')
| -rw-r--r-- | mkspecs/symbian/linux-armcc/qmake.conf | 6 | ||||
| -rw-r--r-- | mkspecs/symbian/linux-gcce/qmake.conf | 16 |
2 files changed, 10 insertions, 12 deletions
diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf index 599e552..77fb1ea 100644 --- a/mkspecs/symbian/linux-armcc/qmake.conf +++ b/mkspecs/symbian/linux-armcc/qmake.conf @@ -6,8 +6,6 @@ include(../../common/symbian/symbian-makefile.conf) include(../../common/armcc.conf) -QMAKE_LIBS += usrt2_2.lib dfpaeabi.dso dfprvct2_2.dso drtaeabi.dso scppnwdl.dso drtrvct2_2.dso h_t__uf.l\\(switch8.o\\) - QMAKE_RVCT_LINKSTYLE = 1 # notice that the middle part of the following set of vars matches the TARGET content of the libs @@ -33,8 +31,8 @@ QMAKE_QtWebKit_CXXFLAGS = --arm # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000. QMAKE_QtWebKit_LFLAGS = --rw-base 0xE00000 -QMAKE_CFLAGS += --dllimport_runtime --preinclude rvct2_2.h --diag_suppress 186,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --export_all_vtbl --no_vfe --apcs /inter $$QMAKE_CFLAGS.ARMCC -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS --no_parse_templates $$QMAKE_CXXFLAGS.ARMCC +QMAKE_CFLAGS += --dllimport_runtime --preinclude rvct2_2.h --diag_suppress 186,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --no_vfe --apcs /inter $$QMAKE_CFLAGS.ARMCC +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $$QMAKE_CXXFLAGS.ARMCC QMAKE_LFLAGS += --symver_soname --diag_suppress 6331,6780 --bpabi --reloc --datacompressor=off --split --dll --no_scanlib QMAKE_LFLAGS_APP += --entry _E32Startup QMAKE_LFLAGS_SHLIB += --entry _E32Dll diff --git a/mkspecs/symbian/linux-gcce/qmake.conf b/mkspecs/symbian/linux-gcce/qmake.conf index 57bb56a..faac2f1 100644 --- a/mkspecs/symbian/linux-gcce/qmake.conf +++ b/mkspecs/symbian/linux-gcce/qmake.conf @@ -83,13 +83,13 @@ for(line, QMAKE_GCC_SEARCH_DIRS) { } } -QMAKE_LIBDIR += $${EPOCROOT}epoc32/release/armv5/lib - -INCLUDEPATH = ${EPOCROOT}epoc32/include/ \ - $${EPOCROOT}epoc32/include/variant \ - $${EPOCROOT}epoc32/include/stdapis \ - $${EPOCROOT}epoc32/include/gcce \ - ${EPOCROOT}epoc32/include/stdapis/sys \ - ${EPOCROOT}epoc32/include/stdapis/stlport \ +QMAKE_LIBDIR += $${EPOCROOT}/epoc32/release/armv5/lib + +INCLUDEPATH = ${EPOCROOT}/epoc32/include/ \ + $${EPOCROOT}/epoc32/include/variant \ + $${EPOCROOT}/epoc32/include/stdapis \ + $${EPOCROOT}/epoc32/include/gcce \ + ${EPOCROOT}/epoc32/include/stdapis/sys \ + ${EPOCROOT}/epoc32/include/stdapis/stlport \ $$INCLUDEPATH |