diff options
Diffstat (limited to 'tests/auto/qmldom/combined')
| -rw-r--r-- | tests/auto/qmldom/combined/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tests/auto/qmldom/combined/tst_dom_all.cpp | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/tests/auto/qmldom/combined/CMakeLists.txt b/tests/auto/qmldom/combined/CMakeLists.txt index 6903f89eff..add44acf0b 100644 --- a/tests/auto/qmldom/combined/CMakeLists.txt +++ b/tests/auto/qmldom/combined/CMakeLists.txt @@ -5,6 +5,13 @@ ## tst_dom_all Binary executing all tests together ## (simpler to verify coverage) ##################################################################### + +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_dom_all LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + # Collect test data file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/.. @@ -20,7 +27,6 @@ qt_internal_add_test(tst_dom_all ../domitem/tst_qmldomitem.h ../merging/tst_dommerging.h ../reformatter/tst_reformatter.h - ../standalone/tst_standalone.h INCLUDE_DIRECTORIES .. DEFINES diff --git a/tests/auto/qmldom/combined/tst_dom_all.cpp b/tests/auto/qmldom/combined/tst_dom_all.cpp index b3920f8e41..6e3e0bd851 100644 --- a/tests/auto/qmldom/combined/tst_dom_all.cpp +++ b/tests/auto/qmldom/combined/tst_dom_all.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "stringdumper/tst_qmldomstringdumper.h" #include "errormessage/tst_qmldomerrormessage.h" @@ -7,7 +7,6 @@ #include "merging/tst_dommerging.h" #include "path/tst_qmldompath.h" #include "reformatter/tst_reformatter.h" -#include "standalone/tst_standalone.h" #include <QtCore/qdebug.h> @@ -38,10 +37,6 @@ int main(int argc, char *argv[]) QQmlJS::Dom::TestReformatter test; status |= QTest::qExec(&test, argc, argv); } - { - QQmlJS::Dom::TestStandalone test; - status |= QTest::qExec(&test, argc, argv); - } if (status) qWarning() << "Combined test failed!"; return status; |