diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 17:19:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 17:19:27 (GMT) |
| commit | 1b7c80fb09e962c7a05249d4b2779b84701ed326 (patch) | |
| tree | cc86e8593614ea88012db53ea905fedf25e66a2a /mkspecs/common | |
| parent | 78b3b444d0d1f3d0afa9c4317f4e183ab2368b5c (diff) | |
| parent | 7c613a9ef4610fa2e0e1630eb3cd2b474875631d (diff) | |
| download | Qt-1b7c80fb09e962c7a05249d4b2779b84701ed326.zip Qt-1b7c80fb09e962c7a05249d4b2779b84701ed326.tar.gz Qt-1b7c80fb09e962c7a05249d4b2779b84701ed326.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (35 commits)
Fix a crash in QGtkStyle when theme not available
Exporting QFontDatabase::removeAllApplicationFonts()
Adding QFontDatabase::removeAllApplicationFonts()
Fixed crash in Phonon MMF backend during application shutdown
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e9151b11e974f0aa47fd40c225f88f35ced91496 )
Fixed bitfield-related crash on Symbian WINSCW
Compile with MSVC 2005 and 2003 when no platform SDK is used
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( c39615d8e78f083b23f34ac24cf7d3a7ce765122 )
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( bd724fb2f716336a8a4b54cd2edc96851a5a26a4 )
QS60Style: very tall QSpinBox's buttons hide lineEdit
Export QGLContextResource for use with Qt/3D
Use QSKIP rather than commenting a failure.
Refactor QDirectFBPixmap::fromImage slightly
QDirectFBPixmap can handle NoOpaqueDetection.
Reverts using composition mode when using DeviceCoordinateMode cache.
Fix linking error
Fix compile error on Symbian 9.1, caused in network/access.
QInputContextFactory::languages implementation for Symbian.
QS60Style cannot draw transparency to UI element border areas
Changed pkg_prerules to not use default_deployment for vendor ID
...
Diffstat (limited to 'mkspecs/common')
| -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) - |