diff options
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickscreen.cpp | 6 | ||||
| -rw-r--r-- | src/quick/items/qquickscreen_p.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp index 4b70e2b0b2..b6bd78bd7f 100644 --- 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 1940f16b02..7e2c389d6c 100644 --- 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*); |