summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget.cpp
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2011-03-29 08:23:26 (GMT)
committerJerome Pasion <jerome.pasion@nokia.com>2011-03-29 08:23:26 (GMT)
commitc66ffc1033a11390028a562007fe10f0f2bb870d (patch)
treee3d561878329431d074add9ad8ff9a9dfdffa8bb /src/gui/kernel/qwidget.cpp
parenteaab529d00ce6bd65ca44a4ae4edbf4128b844a6 (diff)
parent7884b913c006402eded0bfe36053c9c557d8d9d6 (diff)
downloadQt-c66ffc1033a11390028a562007fe10f0f2bb870d.zip
Qt-c66ffc1033a11390028a562007fe10f0f2bb870d.tar.gz
Qt-c66ffc1033a11390028a562007fe10f0f2bb870d.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
-rw-r--r--src/gui/kernel/qwidget.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 6a44bcc..fd9deb5 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -306,6 +306,7 @@ QWidgetPrivate::QWidgetPrivate(int version)
, qd_hd(0)
#elif defined(Q_OS_SYMBIAN)
, symbianScreenNumber(0)
+ , fixNativeOrientationCalled(false)
#endif
{
if (!qApp) {
@@ -10868,6 +10869,9 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
}
QT_TRAP_THROWING(appUi->SetOrientationL(s60orientation));
S60->orientationSet = true;
+ QSymbianControl *window = static_cast<QSymbianControl *>(internalWinId());
+ if (window)
+ window->ensureFixNativeOrientation();
#endif
break;
}