diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-04 16:06:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-04 16:06:43 (GMT) |
| commit | 215e5b51392f3b0129ad62c4f5efdfc3a0ba6ed6 (patch) | |
| tree | 25dc4c397c3c51de71f53ab4c68d14ee022fc498 /src/gui | |
| parent | a57338309016f503653d677ea13f33780b55e4e5 (diff) | |
| parent | 18daa683a389abd42d71fd616e271b74ce749efc (diff) | |
| download | Qt-215e5b51392f3b0129ad62c4f5efdfc3a0ba6ed6.zip Qt-215e5b51392f3b0129ad62c4f5efdfc3a0ba6ed6.tar.gz Qt-215e5b51392f3b0129ad62c4f5efdfc3a0ba6ed6.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:
Add support for -runtimegraphicssystem configure option
runonphone - catch ctrl-c and terminate remote process before exit
Skipped rcomp check on Raptor.
Fix package header in cases where VERSION doesn't contain all values
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qgraphicssystem_runtime.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp index 3438137..568f4d7 100644 --- a/src/gui/painting/qgraphicssystem_runtime.cpp +++ b/src/gui/painting/qgraphicssystem_runtime.cpp @@ -346,11 +346,14 @@ QRuntimeGraphicsSystem::QRuntimeGraphicsSystem() QApplicationPrivate::graphics_system_name = QLatin1String("runtime"); QApplicationPrivate::runtime_graphics_system = true; +#ifdef QT_DEFAULT_RUNTIME_SYSTEM + m_graphicsSystemName = QLatin1String(QT_DEFAULT_RUNTIME_SYSTEM); + if (m_graphicsSystemName.isNull()) +#endif + m_graphicsSystemName = QLatin1String("raster"); + #ifdef Q_OS_SYMBIAN - m_graphicsSystemName = QLatin1String("openvg"); m_windowSurfaceDestroyPolicy = DestroyAfterFirstFlush; -#else - m_graphicsSystemName = QLatin1String("raster"); #endif m_graphicsSystem = QGraphicsSystemFactory::create(m_graphicsSystemName); |