Fix Screen::AngleBetween

Enum values in invokables don't worry currently, so use ints.

Also AngleBetween is no longer static, so it has to be initialized
before the function can be used.

Change-Id: I4a6748fef6920bab6f08f22ce68911c3af6ce821
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp
index 4b70e2b..b6bd78b 100644 (file)
--- a/src/quick/items/qquickscreen.cpp
+++ b/src/quick/items/qquickscreen.cpp
@@ -130,9 +130,11 @@ Qt::ScreenOrientation QQuickScreenAttached::orientation() const
     return m_screen->orientation();
 }
 
-int QQuickScreenAttached::angleBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b)
+int QQuickScreenAttached::angleBetween(int a, int b)
 {
-    return m_screen->angleBetween(a,b);
+    if (!m_screen)
+        return Qt::PrimaryOrientation;
+    return m_screen->angleBetween((Qt::ScreenOrientation)a,(Qt::ScreenOrientation)b);
 }
 
 void QQuickScreenAttached::canvasChanged(QQuickCanvas* c)//Called by QQuickItemPrivate::initCanvas

diff --git a/src/quick/items/qquickscreen_p.h b/src/quick/items/qquickscreen_p.h
index 1940f16..7e2c389 100644 (file)
--- a/src/quick/items/qquickscreen_p.h
+++ b/src/quick/items/qquickscreen_p.h
@@ -73,7 +73,8 @@ public:
     Qt::ScreenOrientation primaryOrientation() const;
     Qt::ScreenOrientation orientation() const;
 
-    Q_INVOKABLE int angleBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b);
+    //Treats int as Qt::ScreenOrientation, due to QTBUG-20639
+    Q_INVOKABLE int angleBetween(int a, int b);
 
     void canvasChanged(QQuickCanvas*);