diff options
| author | axis <qt-info@nokia.com> | 2009-09-23 14:09:57 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-09-23 14:09:57 (GMT) |
| commit | a90629bf80c1635226b42c299238878c8e6847ec (patch) | |
| tree | 9d52ec46822fb9ba3eb76d7c8960b81777824f52 /src/gui/kernel/qt_s60_p.h | |
| parent | 17c13775085cfa2ce3c5352cff51c02daaa6662b (diff) | |
| parent | 4184d85022e2fb3d90dfa4cb211ea5e8e968dec7 (diff) | |
| download | Qt-a90629bf80c1635226b42c299238878c8e6847ec.zip Qt-a90629bf80c1635226b42c299238878c8e6847ec.tar.gz Qt-a90629bf80c1635226b42c299238878c8e6847ec.tar.bz2 | |
Merge branch 's60MainHelperClasses' into 4.6
Diffstat (limited to 'src/gui/kernel/qt_s60_p.h')
| -rw-r--r-- | src/gui/kernel/qt_s60_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h index 9939f2c..3a2dd2b 100644 --- a/src/gui/kernel/qt_s60_p.h +++ b/src/gui/kernel/qt_s60_p.h @@ -61,6 +61,7 @@ #include "QtGui/qimage.h" #include "QtGui/qevent.h" #include "qpointer.h" +#include "qapplication.h" #include <w32std.h> #include <coecntrl.h> #include <eikenv.h> @@ -77,7 +78,7 @@ QT_BEGIN_NAMESPACE // Application internal HandleResourceChangeL events, -// system evens seems to start with 0x10 +// system events seems to start with 0x10 const TInt KInternalStatusPaneChange = 0x50000000; class QS60Data @@ -107,6 +108,7 @@ public: int mouseInteractionEnabled : 1; int virtualMouseRequired : 1; int qtOwnsS60Environment : 1; + QApplication::QS60MainApplicationFactory s60ApplicationFactory; // typedef'ed pointer type static inline void updateScreenSize(); static inline RWsSession& wsSession(); static inline RWindowGroup& windowGroup(); |