diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-14 16:05:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-14 16:05:55 (GMT) |
| commit | 9f1bf75b1d55af2dda000cba580fafed2aa83838 (patch) | |
| tree | 5ba2221956374ce3669bd6df52c29cb262cb66ae /src/gui/kernel/qt_s60_p.h | |
| parent | e9e95f75e7c1e8325c2acce0087ff8677d773779 (diff) | |
| parent | 61e7b85a146778ce5907000733f246e4ebdce26a (diff) | |
| download | Qt-9f1bf75b1d55af2dda000cba580fafed2aa83838.zip Qt-9f1bf75b1d55af2dda000cba580fafed2aa83838.tar.gz Qt-9f1bf75b1d55af2dda000cba580fafed2aa83838.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/gui/kernel/qt_s60_p.h')
| -rw-r--r-- | src/gui/kernel/qt_s60_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h index 02977ce..f88405e 100644 --- a/src/gui/kernel/qt_s60_p.h +++ b/src/gui/kernel/qt_s60_p.h @@ -159,6 +159,7 @@ public: int menuBeingConstructed : 1; int orientationSet : 1; int partial_keyboard : 1; + int partialKeyboardOpen : 1; QApplication::QS60MainApplicationFactory s60ApplicationFactory; // typedef'ed pointer type QPointer<QWidget> splitViewLastWidget; @@ -348,6 +349,7 @@ inline QS60Data::QS60Data() menuBeingConstructed(0), orientationSet(0), partial_keyboard(0), + partialKeyboardOpen(0), s60ApplicationFactory(0) #ifdef Q_OS_SYMBIAN ,s60InstalledTrapHandler(0) |