1 files changed, 6 insertions, 27 deletions
diff --git a/src/gui/kernel/qplatformscreen_qpa.cpp b/src/gui/kernel/qplatformscreen_qpa.cpp
index 26c685ff1a..b8f1430d1b 100644
--- a/src/gui/kernel/qplatformscreen_qpa.cpp
+++ b/src/gui/kernel/qplatformscreen_qpa.cpp
@@ -1,8 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
@@ -35,6 +34,7 @@
 **
 **
 **
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -160,36 +160,15 @@ QDpi QPlatformScreen::logicalDpi() const
 }
 
 /*!
-    Reimplement this function in subclass to return the primary orientation
-    of the screen, i.e. the orientation the display controller or equivalent
-    expects.
-
-    The default implementation returns Qt::PortraitOrientation if the
-    geometry's height is greater or Qt::LandscapeOrientation if the geometry's
-    width is greater.
-*/
-Qt::ScreenOrientation QPlatformScreen::primaryOrientation() const
-{
-    return geometry().height() > geometry().width() ? Qt::PortraitOrientation :
-        Qt::LandscapeOrientation;
-}
-
-/*!
     Reimplement this function in subclass to return the current orientation
     of the screen, for example based on accelerometer data to determine
-    the physical screen orientation.
-
-    The current orientation is only a hint to the application saying
-    what the preferred application orientation should be, the application
-    is free to limit itself to a certain set of supported orientations.
-
-    The default implementation returns the same as primaryOrientation().
+    the device orientation.
 
-    \sa primaryOrientation()
+    The default implementation returns Qt::PrimaryOrientation.
 */
-Qt::ScreenOrientation QPlatformScreen::currentOrientation() const
+Qt::ScreenOrientation QPlatformScreen::orientation() const
 {
-    return primaryOrientation();
+    return Qt::PrimaryOrientation;
 }
 
 QPlatformScreen * QPlatformScreen::platformScreenForWindow(const QWindow *window)