Remove widget attribute orientation values from Qt:: enum.

These were only actually implemented on Symbian, thus, they aren't too useful,
apart from confusing developers when they don't work.

Removed per the discussion on:
http://lists.qt-project.org/pipermail/development/2011-December/000860.html

Change-Id: Id097cb392a3d964364adbe51a72a22927b9c382c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Robin Burchell 2011-12-15 10:18:37 +01:00 committed by Qt by Nokia
parent 51fb43b37f
commit eada3449b9
3 changed files with 0 additions and 52 deletions

View File

@ -466,10 +466,6 @@ public:
WA_Maemo5StackedWindow = 127, WA_Maemo5StackedWindow = 127,
#endif #endif
WA_LockPortraitOrientation = 128,
WA_LockLandscapeOrientation = 129,
WA_AutoOrientation = 130,
#if 0 // these values are reserved for Maemo5 - do not re-use them #if 0 // these values are reserved for Maemo5 - do not re-use them
WA_Maemo5PortraitOrientation = WA_LockPortraitOrientation, WA_Maemo5PortraitOrientation = WA_LockPortraitOrientation,
WA_Maemo5LandscapeOrientation = WA_LockLandscapeOrientation, WA_Maemo5LandscapeOrientation = WA_LockLandscapeOrientation,
@ -478,7 +474,6 @@ public:
#endif #endif
WA_X11DoNotAcceptFocus = 132, WA_X11DoNotAcceptFocus = 132,
WA_SymbianNoSystemRotation = 133,
WA_MacNoShadow = 134, WA_MacNoShadow = 134,
// Add new attributes before this line // Add new attributes before this line

View File

@ -1158,13 +1158,6 @@
to this top level window. This attribute has no effect on non-X11 to this top level window. This attribute has no effect on non-X11
platforms. platforms.
\value WA_LockPortraitOrientation Locks the widget to a portrait orientation,
ignoring changes to the display's orientation with respect to the user.
\value WA_LockLandscapeOrientation Locks the widget to a landscape orientation,
ignoring changes to the display's orientation with respect to the user.
\value WA_AutoOrientation Causes the widget to change orientation whenever the
display changes orientation with respect to the user.
\value WA_MacNoShadow Since Qt 4.8, this attribute disables drop shadows \value WA_MacNoShadow Since Qt 4.8, this attribute disables drop shadows
for this top level window. Only affects Cocoa builds of Qt for Mac OS X. for this top level window. Only affects Cocoa builds of Qt for Mac OS X.
@ -1198,7 +1191,6 @@
\omitvalue WA_SetWindowModality \omitvalue WA_SetWindowModality
\omitvalue WA_WState_WindowOpacitySet \omitvalue WA_WState_WindowOpacitySet
\omitvalue WA_WState_AcceptedTouchBeginEvent \omitvalue WA_WState_AcceptedTouchBeginEvent
\omitvalue WA_SymbianNoSystemRotation
*/ */
/*! \typedef Qt::HANDLE /*! \typedef Qt::HANDLE

View File

@ -10313,45 +10313,6 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
d->registerTouchWindow(); d->registerTouchWindow();
#endif #endif
break; break;
case Qt::WA_LockPortraitOrientation:
case Qt::WA_LockLandscapeOrientation:
case Qt::WA_AutoOrientation: {
const Qt::WidgetAttribute orientations[3] = {
Qt::WA_LockPortraitOrientation,
Qt::WA_LockLandscapeOrientation,
Qt::WA_AutoOrientation
};
if (on) {
// We can only have one of these set at a time
for (int i = 0; i < 3; ++i) {
if (orientations[i] != attribute)
setAttribute_internal(orientations[i], false, data, d);
}
}
#ifdef Q_WS_S60
CAknAppUiBase* appUi = static_cast<CAknAppUiBase*>(CEikonEnv::Static()->EikAppUi());
const CAknAppUiBase::TAppUiOrientation s60orientations[] = {
CAknAppUiBase::EAppUiOrientationPortrait,
CAknAppUiBase::EAppUiOrientationLandscape,
CAknAppUiBase::EAppUiOrientationAutomatic
};
CAknAppUiBase::TAppUiOrientation s60orientation = CAknAppUiBase::EAppUiOrientationUnspecified;
for (int i = 0; i < 3; ++i) {
if (testAttribute(orientations[i])) {
s60orientation = s60orientations[i];
break;
}
}
QT_TRAP_THROWING(appUi->SetOrientationL(s60orientation));
S60->orientationSet = true;
QSymbianControl *window = static_cast<QSymbianControl *>(internalWinId());
if (window)
window->ensureFixNativeOrientation();
#endif
break;
}
default: default:
break; break;
} }