diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-03-31 08:12:41 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-03-31 08:12:41 (GMT) |
| commit | a833d593da01d7ecf48eda4e62514ed56fb2be97 (patch) | |
| tree | 963df96ca269f56b3c0b4912d5b73de3bfe4c07d /mkspecs | |
| parent | 456fdf4e5fe05e94955df0fc7d76c384a0bcfbc5 (diff) | |
| parent | edd41ee5488716cf8336a7d8ea0cb3d48d0e7b14 (diff) | |
| download | Qt-a833d593da01d7ecf48eda4e62514ed56fb2be97.zip Qt-a833d593da01d7ecf48eda4e62514ed56fb2be97.tar.gz Qt-a833d593da01d7ecf48eda4e62514ed56fb2be97.tar.bz2 | |
Merge commit 'origin/4.7' into symbian47
Conflicts:
src/3rdparty/webkit/WebCore/WebCore.pro
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index a9d7dca..bd5768b 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -26,6 +26,8 @@ QMAKE_CFLAGS_RELEASE = QMAKE_CFLAGS_DEBUG = QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + +VERSION_FLAGS.ARMCC = ARMCC_4_0 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS # Symbian build system applies -cwd source on the MWCC command line. # this causes problems with include paths, -cwd include uses the same @@ -33,7 +35,8 @@ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS # This should really be fixed in raptor, as using CXXFLAGS means we pass # both on the command line and rely on the compiler using the last specified QMAKE_CXXFLAGS.CW = -cwd include -QMAKE_CXXFLAGS.ARMCC = --visibility_inlines_hidden +QMAKE_CXXFLAGS.ARMCC = --visibility_inlines_hidden +QMAKE_CXXFLAGS.ARMCC_4_0 = --import_all_vtbl QMAKE_CXXFLAGS.GCCE = -fvisibility-inlines-hidden QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON @@ -107,7 +110,5 @@ QMAKE_TAR = tar -cf QMAKE_GZIP = gzip -9f QT_ARCH = symbian - load(qt_config) load(symbian/platform_paths) - |