diff options
| author | Albert Astals Cid <albert.astals@canonical.com> | 2015-02-06 10:40:03 +0100 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals@canonical.com> | 2015-02-06 10:08:36 +0000 |
| commit | 1c678e09c997ee96563404a28820c5068679e633 (patch) | |
| tree | f53cd08997e319e42a3da1434e6d6ba81d20bef7 /src/quick/items/qquickscreen_p.h | |
| parent | 0b60867f80e207a9ccc27cc337116d1c6fc928bd (diff) | |
Fix regression where QQuickScreenAttached overwrites QScreen values
Up to Qt 5.3 it was fine setting the orientationUpdateMask in
QScreen in C++, with 5.4 that value is always discarded and overwrote
with 0, this change makes it possible to still set the orientationUpdateMask
value in C++ and not have it overwritten unless specifically changed from QML
Change-Id: I134290ce91be8b91df4e9e8e71120753813f48d7
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/quick/items/qquickscreen_p.h')
| -rw-r--r-- | src/quick/items/qquickscreen_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquickscreen_p.h b/src/quick/items/qquickscreen_p.h index 257b18cfe0..a36641cc71 100644 --- a/src/quick/items/qquickscreen_p.h +++ b/src/quick/items/qquickscreen_p.h @@ -106,6 +106,7 @@ private: QQuickWindow* m_window; QQuickItem* m_attachee; Qt::ScreenOrientations m_updateMask; + bool m_updateMaskSet; }; class Q_AUTOTEST_EXPORT QQuickScreen : public QObject |