Merge remote-tracking branch 'origin/api_changes'

Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1

1 files changed, 7 insertions, 7 deletions

diff --git a/src/gui/kernel/qscreen.h b/src/gui/kernel/qscreen.h
index 111e10d340..f69e04a595 100644
--- a/src/gui/kernel/qscreen.h
+++ b/src/gui/kernel/qscreen.h
@@ -118,14 +118,14 @@ public:
     Qt::ScreenOrientation primaryOrientation() const;
     Qt::ScreenOrientation orientation() const;
 
-    int angleBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b);
-    QTransform transformBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b, const QRect &target);
-    QRect mapBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b, const QRect &rect);
+    int angleBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b) const;
+    QTransform transformBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b, const QRect &target) const;
+    QRect mapBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b, const QRect &rect) const;
 
-    bool isPortrait(Qt::ScreenOrientation orientation);
-    bool isLandscape(Qt::ScreenOrientation orientation);
+    bool isPortrait(Qt::ScreenOrientation orientation) const;
+    bool isLandscape(Qt::ScreenOrientation orientation) const;
 
-    QPixmap grabWindow(WId window, int x, int y, int w, int h) const;
+    QPixmap grabWindow(WId window, int x, int y, int w, int h);
 
 Q_SIGNALS:
     void sizeChanged(const QSize &size);
@@ -142,7 +142,7 @@ Q_SIGNALS:
     void orientationChanged(Qt::ScreenOrientation orientation);
 
 private:
-    QScreen(QPlatformScreen *screen);
+    explicit QScreen(QPlatformScreen *screen);
 
     Q_DISABLE_COPY(QScreen)
     friend class QGuiApplicationPrivate;