diff options
author | Liang Qi <liang.qi@qt.io> | 2019-01-10 16:47:26 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-01-10 16:47:26 +0100 |
commit | efa04c2ae8427c70848477ace3d8f6e82baaab11 (patch) | |
tree | c0394c9cd5ce51961337a7a15e169074dd41632b /tests/manual/gifs/data/qtquickcontrols2-menu.qml | |
parent | 9c7429219d36e8eb40e1fe6e679715c89209fc40 (diff) | |
parent | 6476de0b669162cf08c11f5c8d5ad0b42419f365 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
src/imports/controls/qtquickcontrols2plugin.cpp
Change-Id: I27f1260b539354e084beb28be78385e57fda63e1
Diffstat (limited to 'tests/manual/gifs/data/qtquickcontrols2-menu.qml')
-rw-r--r-- | tests/manual/gifs/data/qtquickcontrols2-menu.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/manual/gifs/data/qtquickcontrols2-menu.qml b/tests/manual/gifs/data/qtquickcontrols2-menu.qml index 1fd0b5ba..39403e06 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-menu.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-menu.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 // TODO: restore and finish https://codereview.qt-project.org/#/c/123948/ ApplicationWindow { |