diff options
author | Liang Qi <liang.qi@qt.io> | 2019-01-09 22:41:30 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-01-09 22:41:30 +0100 |
commit | 29e31fad480e097d7cca121c44fc16028ac3ffa9 (patch) | |
tree | aeb838387527807bbe9907eea828b8c1dd6384d8 /src/effects/doc/snippets/ColorOverlay-example.qml | |
parent | 1f36922ea047e6a8c062318a779e9675022cb5b7 (diff) | |
parent | 43564140cb702994971f7c5fff3227f700c32995 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I73721d9841e91777638474816da4e387c7c9db59
Diffstat (limited to 'src/effects/doc/snippets/ColorOverlay-example.qml')
-rw-r--r-- | src/effects/doc/snippets/ColorOverlay-example.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/effects/doc/snippets/ColorOverlay-example.qml b/src/effects/doc/snippets/ColorOverlay-example.qml index 7593286..6c7c91e 100644 --- a/src/effects/doc/snippets/ColorOverlay-example.qml +++ b/src/effects/doc/snippets/ColorOverlay-example.qml @@ -38,8 +38,8 @@ ****************************************************************************/ //! [example] -import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 Item { width: 300 |