diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2020-09-08 17:33:17 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-10-07 13:31:10 +0200 |
| commit | 8b534487044dfb3b464431ecb91ef4e0864af4ed (patch) | |
| tree | c801af7dc290a1108764bc54659ab2e417bb9cef /tests/auto/controls | |
| parent | 280b7526d41244912ce89d3be1e3d47329453658 (diff) | |
Default to the most appropriate built-in style if none is specified
[ChangeLog][Styles] An appropriate built-in style is now used as the
default style if one is available for the target platform. For example,
when running a Qt Quick Controls application on macOS, the macOS style
will be used. On Android, the Material style will be used. When running
on e.g. an embedded device, where no native style is available, use the
Basic (formerly "Default") style.
Change-Id: Ie61d1a8a1a83fbeba63387c7ca3671084f47bc04
Fixes: QTBUG-86403
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/controls')
| -rw-r--r-- | tests/auto/controls/basic/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/controls/basic/basic.pro | 1 | ||||
| -rw-r--r-- | tests/auto/controls/basic/tst_basic.cpp | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/controls/basic/CMakeLists.txt b/tests/auto/controls/basic/CMakeLists.txt index f19a133f..a7a4e29c 100644 --- a/tests/auto/controls/basic/CMakeLists.txt +++ b/tests/auto/controls/basic/CMakeLists.txt @@ -19,6 +19,7 @@ qt_add_test(tst_basic TST_CONTROLS_DATA=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../tests/auto/controls/data\\\" PUBLIC_LIBRARIES Qt::Gui + Qt::QuickControls2 TESTDATA ${test_data} ) diff --git a/tests/auto/controls/basic/basic.pro b/tests/auto/controls/basic/basic.pro index f50dc036..9407e162 100644 --- a/tests/auto/controls/basic/basic.pro +++ b/tests/auto/controls/basic/basic.pro @@ -1,6 +1,7 @@ TEMPLATE = app TARGET = tst_basic CONFIG += qmltestcase +QT += quickcontrols2 DEFINES += TST_CONTROLS_DATA=\\\"$$QQC2_SOURCE_TREE/tests/auto/controls/data\\\" diff --git a/tests/auto/controls/basic/tst_basic.cpp b/tests/auto/controls/basic/tst_basic.cpp index 24b27cf6..95d7e36a 100644 --- a/tests/auto/controls/basic/tst_basic.cpp +++ b/tests/auto/controls/basic/tst_basic.cpp @@ -35,10 +35,12 @@ ****************************************************************************/ #include <QtQuickTest/quicktest.h> +#include <QtQuickControls2/qquickstyle.h> int main(int argc, char *argv[]) { QTEST_SET_MAIN_SOURCE_PATH qputenv("QML_NO_TOUCH_COMPRESSION", "1"); + QQuickStyle::setStyle("Basic"); return quick_test_main(argc, argv, "tst_controls::Basic", TST_CONTROLS_DATA); } |