diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-24 20:20:56 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-24 20:20:56 (GMT) |
| commit | e4002434bfde5c8206463ea3a0d4140835619944 (patch) | |
| tree | f199a1e233867ab4e85d22aa138391585af75fca /mkspecs | |
| parent | 3f183debfd677b952b015f6950131dd25bd4768b (diff) | |
| parent | 5a7c14af3c27089b0b8698da3c689637ffaa9cfa (diff) | |
| download | Qt-e4002434bfde5c8206463ea3a0d4140835619944.zip Qt-e4002434bfde5c8206463ea3a0d4140835619944.tar.gz Qt-e4002434bfde5c8206463ea3a0d4140835619944.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 3 | ||||
| -rw-r--r-- | mkspecs/symbian-sbsv2/flm/qt/qt.xml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index af2be8f..3ba2a8c 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -106,7 +106,8 @@ QMAKE_STRIPFLAGS_LIB += --strip-unneeded load(qt_config) load(platform_paths) -MMP_RULES += EXPORTUNFROZEN PAGED +MMP_RULES += PAGED +MMP_RULES += "OPTION_REPLACE ARMCC --export_all_vtbl // don't use --export_all_vtbl" SYMBIAN_PLATFORMS = WINSCW GCCE ARMV5 ARMV6 # Legacy support requires some hardcoded stdapis paths. diff --git a/mkspecs/symbian-sbsv2/flm/qt/qt.xml b/mkspecs/symbian-sbsv2/flm/qt/qt.xml index ad08bd8..2c46f78 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qt.xml +++ b/mkspecs/symbian-sbsv2/flm/qt/qt.xml @@ -12,7 +12,7 @@ <build xmlns="http://symbian.com/xml/build" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://symbian.com/xml/build http://symbian.com/xml/build/1_0.xsd"> + xsi:schemaLocation="http://symbian.com/xml/build http://symbian.com/xml/build/2_0.xsd"> <!-- Extension interfaces : replacements for Template Extension Makefiles --> |