diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2011-02-15 05:36:34 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2011-02-15 05:36:34 (GMT) |
| commit | 5eb9edbd51df63fe3329e8ddc1325ed3024211ad (patch) | |
| tree | e5f5ed8633385f559c16262d3a6e6d14b4578f14 /src/gui/kernel/qt_s60_p.h | |
| parent | b428301a2af0a68ff40d75003ed85aafb19f03f7 (diff) | |
| parent | 5f9f98ec047024fadbfdea334fbea7c357179032 (diff) | |
| download | Qt-5eb9edbd51df63fe3329e8ddc1325ed3024211ad.zip Qt-5eb9edbd51df63fe3329e8ddc1325ed3024211ad.tar.gz Qt-5eb9edbd51df63fe3329e8ddc1325ed3024211ad.tar.bz2 | |
Merge branch '4.7' into qtquick11
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 fdb35d5..40697bf 100644 --- a/src/gui/kernel/qt_s60_p.h +++ b/src/gui/kernel/qt_s60_p.h @@ -141,6 +141,7 @@ public: int supportsPremultipliedAlpha : 1; int avkonComponentsSupportTransparency : 1; int menuBeingConstructed : 1; + int orientationSet : 1; QApplication::QS60MainApplicationFactory s60ApplicationFactory; // typedef'ed pointer type static CEikButtonGroupContainer *cba; @@ -295,6 +296,7 @@ inline QS60Data::QS60Data() supportsPremultipliedAlpha(0), avkonComponentsSupportTransparency(0), menuBeingConstructed(0), + orientationSet(0), s60ApplicationFactory(0) #ifdef Q_OS_SYMBIAN ,s60InstalledTrapHandler(0) |