diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2012-02-20 09:35:02 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-20 11:28:00 +0100 |
| commit | 9d2a09ddbda602c1fb32f23aaa33a9a51989e06c (patch) | |
| tree | 15b67e4540e78028260962898fd0e872baab992d /src/quick/items/qquickscreen.cpp | |
| parent | cb9a213e540c5152a5c9634d590285fb4d231141 (diff) | |
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>
Diffstat (limited to 'src/quick/items/qquickscreen.cpp')
| -rw-r--r-- | src/quick/items/qquickscreen.cpp | 6 |
1 files changed, 4 insertions, 2 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 |