diff options
| author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-08-26 14:03:42 +0200 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-08-26 14:03:42 +0200 |
| commit | 2a054d48ef5a412d104aff0389bcaa69ba2c9878 (patch) | |
| tree | 953847f836611a0b2225f2fe62808623538a9ca8 /tests/auto/qquickcontrol | |
| parent | 2812d380e5999733aaaf2ace2bdbd0702ce293dc (diff) | |
| parent | f51b569219f4fe9ee196c92958bb5dc9f3810678 (diff) | |
Merge branch 'dev' into nativestyle
Change-Id: I9999194551f71abec3731355cd746e69e2e0b187
Diffstat (limited to 'tests/auto/qquickcontrol')
| -rw-r--r-- | tests/auto/qquickcontrol/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/qquickcontrol/data/flickable.qml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/qquickcontrol/CMakeLists.txt b/tests/auto/qquickcontrol/CMakeLists.txt index 59e1ccb6..0599ce32 100644 --- a/tests/auto/qquickcontrol/CMakeLists.txt +++ b/tests/auto/qquickcontrol/CMakeLists.txt @@ -24,6 +24,7 @@ qt_add_test(tst_qquickcontrol Qt::GuiPrivate Qt::QmlPrivate Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate diff --git a/tests/auto/qquickcontrol/data/flickable.qml b/tests/auto/qquickcontrol/data/flickable.qml index f3a1c381..0ac72320 100644 --- a/tests/auto/qquickcontrol/data/flickable.qml +++ b/tests/auto/qquickcontrol/data/flickable.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.14 -import QtQuick.Controls 2.14 +import QtQuick +import QtQuick.Controls ApplicationWindow { width: 400 |