From 6fef0662cb82489533be3308963d08e4f74f8412 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 22 Aug 2023 08:23:38 +0200 Subject: Examples test: Clean up CMakeLists.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pick-to: 6.6 6.5 Change-Id: I22037de62041351d6aecbae86643f8e8f39b0361 Reviewed-by: Qt CI Bot Reviewed-by: Kai Köhne --- tests/auto/quick/examples/CMakeLists.txt | 22 +--------------------- tests/auto/quick/examples/tst_examples.cpp | 8 -------- 2 files changed, 1 insertion(+), 29 deletions(-) (limited to 'tests') diff --git a/tests/auto/quick/examples/CMakeLists.txt b/tests/auto/quick/examples/CMakeLists.txt index bd0b9283d..d81e5ed30 100644 --- a/tests/auto/quick/examples/CMakeLists.txt +++ b/tests/auto/quick/examples/CMakeLists.txt @@ -1,12 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from examples.pro. - -##################################################################### -## tst_examples Test: -##################################################################### - if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) cmake_minimum_required(VERSION 3.16) project(tst_examples LANGUAGES CXX) @@ -19,20 +13,6 @@ qt_internal_add_test(tst_examples DEFINES SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" LIBRARIES - Qt6::CorePrivate Qt6::Gui - Qt6::GuiPrivate - Qt6::QmlPrivate - Qt6::QuickPrivate -) - -#### Keys ignored in scope 1:.:.:examples.pro:: -# testcase.timeout = "400" - -## Scopes: -##################################################################### - -qt_internal_extend_target(tst_examples CONDITION NOT TARGET Qt6::XmlPatterns - DEFINES - QT_NO_XMLPATTERNS + Qt6::Quick ) diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp index f25a08c63..e81ea8383 100644 --- a/tests/auto/quick/examples/tst_examples.cpp +++ b/tests/auto/quick/examples/tst_examples.cpp @@ -68,14 +68,6 @@ tst_examples::tst_examples() excludedFiles << "examples/demos/robotarm/main.qml"; // relies on custom import excludedFiles << "examples/demos/FX_Material_Showroom/main.qml"; // relies on custom import -#ifdef QT_NO_XMLPATTERNS - excludedDirs << "demos/twitter"; - excludedDirs << "demos/flickr"; - excludedFiles << "snippets/qml/xmlrole.qml"; - excludedFiles << "particles/itemparticle/particleview.qml"; - excludedFiles << "views/visualdatamodel/slideshow.qml"; -#endif - #if !QT_CONFIG(opengl) //No support for Particles excludedFiles << "examples/qml/dynamicscene/dynamicscene.qml"; -- cgit v1.2.3