diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-16 08:02:12 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-16 08:08:59 (GMT) |
| commit | 3773fcb78db02a2577c89f755c07c2c7dbf0de74 (patch) | |
| tree | 95115e9ccebc81ae8fdb6dfa9f8305ff9feff462 /src/gui/kernel/qt_s60_p.h | |
| parent | 9f1bf75b1d55af2dda000cba580fafed2aa83838 (diff) | |
| parent | 7e4a9187bb11b794e45d95d2e9fae026d6b0d07d (diff) | |
| download | Qt-3773fcb78db02a2577c89f755c07c2c7dbf0de74.zip Qt-3773fcb78db02a2577c89f755c07c2c7dbf0de74.tar.gz Qt-3773fcb78db02a2577c89f755c07c2c7dbf0de74.tar.bz2 | |
Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7
Conflicts:
src/gui/kernel/qt_s60_p.h
Diffstat (limited to 'src/gui/kernel/qt_s60_p.h')
| -rw-r--r-- | src/gui/kernel/qt_s60_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h index f88405e..0023649 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 partial_keyboardAutoTranslation : 1; int partialKeyboardOpen : 1; QApplication::QS60MainApplicationFactory s60ApplicationFactory; // typedef'ed pointer type QPointer<QWidget> splitViewLastWidget; @@ -300,6 +301,7 @@ private: void translateAdvancedPointerEvent(const TAdvancedPointerEvent *event); #endif bool isSplitViewWidget(QWidget *widget); + bool hasFocusedAndVisibleChild(QWidget *parentWidget); public: void handleClientAreaChange(); @@ -349,6 +351,7 @@ inline QS60Data::QS60Data() menuBeingConstructed(0), orientationSet(0), partial_keyboard(0), + partial_keyboardAutoTranslation(1), partialKeyboardOpen(0), s60ApplicationFactory(0) #ifdef Q_OS_SYMBIAN |