diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-08-05 09:58:55 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-08-05 09:58:55 (GMT) |
| commit | 2144aece152bc34faff5b25632e808e96d523f48 (patch) | |
| tree | 7a3762788646792cd131f13ce4115111d16790fe /src/gui/kernel/qapplication_p.h | |
| parent | babf1ff43584b454ac24728fbf93bf291b9f36d1 (diff) | |
| parent | 1be2e830da7aa09f92d8cdca906f8a588cd10381 (diff) | |
| download | Qt-2144aece152bc34faff5b25632e808e96d523f48.zip Qt-2144aece152bc34faff5b25632e808e96d523f48.tar.gz Qt-2144aece152bc34faff5b25632e808e96d523f48.tar.bz2 | |
Merge remote branch 'lighthouse/4.7' into lighthouse-master
Diffstat (limited to 'src/gui/kernel/qapplication_p.h')
| -rw-r--r-- | src/gui/kernel/qapplication_p.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index 4f30bb8..3e72a13 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -432,8 +432,10 @@ public: static QPalette *set_pal; static QGraphicsSystem *graphics_system; static QString graphics_system_name; - static QPlatformIntegration *platform_integration; static bool runtime_graphics_system; +#ifdef Q_WS_QPA + static QPlatformIntegration *platform_integration; +#endif private: static QFont *app_font; // private for a reason! Always use QApplication::font() instead! @@ -498,8 +500,7 @@ public: static void processCloseEvent(QWindowSystemInterfacePrivate::CloseEvent *e); - static void processMoveEvent(QWindowSystemInterfacePrivate::MoveEvent *e); - static void processResizeEvent(QWindowSystemInterfacePrivate::ResizeEvent *e); + static void processGeometryChangeEvent(QWindowSystemInterfacePrivate::GeometryChangeEvent *e); static void processEnterEvent(QWindowSystemInterfacePrivate::EnterEvent *e); static void processLeaveEvent(QWindowSystemInterfacePrivate::LeaveEvent *e); @@ -642,7 +643,7 @@ private: #endif #ifdef Q_OS_SYMBIAN - static QHash<TInt, TUint> scanCodeCache; + QHash<TInt, TUint> scanCodeCache; #endif static QApplicationPrivate *self; |