diff options
Diffstat (limited to 'tests/auto/quickcontrols/controls/basic')
-rw-r--r-- | tests/auto/quickcontrols/controls/basic/BLACKLIST | 5 | ||||
-rw-r--r-- | tests/auto/quickcontrols/controls/basic/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/quickcontrols/controls/basic/tst_basic.cpp | 5 |
3 files changed, 10 insertions, 2 deletions
diff --git a/tests/auto/quickcontrols/controls/basic/BLACKLIST b/tests/auto/quickcontrols/controls/basic/BLACKLIST index b643dd1d9c..b822193f4c 100644 --- a/tests/auto/quickcontrols/controls/basic/BLACKLIST +++ b/tests/auto/quickcontrols/controls/basic/BLACKLIST @@ -11,3 +11,8 @@ qnx [ComboBox::test_keyClose] macos arm ci # QTBUG-102817 + +# QTBUG-126236 +[Action::test_repeater] +macos +linux diff --git a/tests/auto/quickcontrols/controls/basic/CMakeLists.txt b/tests/auto/quickcontrols/controls/basic/CMakeLists.txt index dabab76bbe..cc991ca165 100644 --- a/tests/auto/quickcontrols/controls/basic/CMakeLists.txt +++ b/tests/auto/quickcontrols/controls/basic/CMakeLists.txt @@ -6,7 +6,7 @@ if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) cmake_minimum_required(VERSION 3.16) project(tst_basic LANGUAGES C CXX ASM) - find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) endif() ##################################################################### diff --git a/tests/auto/quickcontrols/controls/basic/tst_basic.cpp b/tests/auto/quickcontrols/controls/basic/tst_basic.cpp index 47cd9a393e..7e73bd2231 100644 --- a/tests/auto/quickcontrols/controls/basic/tst_basic.cpp +++ b/tests/auto/quickcontrols/controls/basic/tst_basic.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> #include <QtQuickControls2/qquickstyle.h> @@ -8,6 +8,9 @@ int main(int argc, char *argv[]) { QTEST_SET_MAIN_SOURCE_PATH qputenv("QML_NO_TOUCH_COMPRESSION", "1"); + // The tests were originally written before native menus existed, + // and some of them try to open menus, which we can't test natively. + QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuWindows); QQuickStyle::setStyle("Basic"); return quick_test_main(argc, argv, "tst_controls::Basic", TST_CONTROLS_DATA); } |