diff options
| author | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2010-05-28 14:30:26 (GMT) |
|---|---|---|
| committer | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2010-05-28 14:33:20 (GMT) |
| commit | b42315c1d7811a0997181e188fc39a368ac9175f (patch) | |
| tree | c71f5ce19e50a2259075131584ca2961c82ee7c3 /src/gui/kernel/qapplication_s60.cpp | |
| parent | 22b583438b8ef83535b0b94b695aba22a09cea2b (diff) | |
| download | Qt-b42315c1d7811a0997181e188fc39a368ac9175f.zip Qt-b42315c1d7811a0997181e188fc39a368ac9175f.tar.gz Qt-b42315c1d7811a0997181e188fc39a368ac9175f.tar.bz2 | |
Add runtime_graphics_system flag to QApplicationPrivate.
This flag can be internally used to detect if
QRuntimeGraphicsSystem is used. In some cases Qt needs
to know if runtime graphics system is used and it's
better to have a flag than relsolving graphics system
name every time.
Reviewed-by: Jason Barron
Diffstat (limited to 'src/gui/kernel/qapplication_s60.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 7e270aa..8ab82c9 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -66,7 +66,6 @@ #include "private/qgraphicssystem_runtime_p.h" #endif - #include "apgwgnam.h" // For CApaWindowGroupName #include <mdaaudiotoneplayer.h> // For CMdaAudioToneUtility @@ -958,7 +957,7 @@ void QSymbianControl::Draw(const TRect& controlRect) const if (engine->type() == QPaintEngine::Raster) { QS60WindowSurface *s60Surface; #ifdef QT_GRAPHICSSYSTEM_RUNTIME - if (QApplicationPrivate::graphics_system_name == QLatin1String("runtime")) { + if (QApplicationPrivate::runtime_graphics_system) { QRuntimeWindowSurface *rtSurface = static_cast<QRuntimeWindowSurface*>(qwidget->windowSurface()); s60Surface = static_cast<QS60WindowSurface *>(rtSurface->m_windowSurface); @@ -1855,7 +1854,7 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent if (callSymbianEventFilters(symbianEvent)) return 1; #ifdef QT_GRAPHICSSYSTEM_RUNTIME - if(QApplicationPrivate::graphics_system_name == QLatin1String("runtime")) { + if(QApplicationPrivate::runtime_graphics_system) { bool switchToSwRendering(false); foreach (QWidget *w, QApplication::topLevelWidgets()) { @@ -1887,7 +1886,7 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent if (callSymbianEventFilters(symbianEvent)) return 1; #ifdef QT_GRAPHICSSYSTEM_RUNTIME - if(QApplicationPrivate::graphics_system_name == QLatin1String("runtime")) { + if(QApplicationPrivate::runtime_graphics_system) { QRuntimeGraphicsSystem *gs = static_cast<QRuntimeGraphicsSystem*>(QApplicationPrivate::graphics_system); gs->setGraphicsSystem(QLatin1String("openvg"), S60->memoryLimitForHwRendering); |