From 09b73218cbf8c16ff68cdf12e34a6d3007afec38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20De=20Canni=C3=A8re?= Date: Thu, 4 May 2023 10:31:12 +0200 Subject: [PATCH] QmlDom: Remove the standalone version of QmlDom Change-Id: Icf3194b0a6ce52622a4eef5b3e20bc5180661a20 Reviewed-by: Fabian Kosmale Reviewed-by: Qt CI Bot (cherry picked from commit b153740606956da52ace34a43214b8c70dff5f9e) Reviewed-by: Tim Jenssen Reviewed-by: Casimir Saastamoinen Reviewed-by: Ulf Hermann --- .../coin_dom_standalone_old_qt_mac.yaml | 69 ----------------- .../coin_dom_standalone_old_qt_win.yaml | 75 ------------------- coin/module_config.yaml | 2 - src/qmldom/qqmldomelements_p.h | 6 +- src/qmldom/qqmldomtypesreader.cpp | 6 +- src/qmldom/qqmldomtypesreader_p.h | 10 +-- tests/auto/qmldom/CMakeLists.txt | 1 - tests/auto/qmldom/combined/CMakeLists.txt | 1 - tests/auto/qmldom/combined/tst_dom_all.cpp | 5 -- tests/auto/qmldom/standalone/CMakeLists.txt | 39 ---------- .../auto/qmldom/standalone/tst_standalone.cpp | 5 -- 11 files changed, 5 insertions(+), 214 deletions(-) delete mode 100644 coin/instructions/coin_dom_standalone_old_qt_mac.yaml delete mode 100644 coin/instructions/coin_dom_standalone_old_qt_win.yaml delete mode 100644 tests/auto/qmldom/standalone/CMakeLists.txt delete mode 100644 tests/auto/qmldom/standalone/tst_standalone.cpp diff --git a/coin/instructions/coin_dom_standalone_old_qt_mac.yaml b/coin/instructions/coin_dom_standalone_old_qt_mac.yaml deleted file mode 100644 index d83548877b..0000000000 --- a/coin/instructions/coin_dom_standalone_old_qt_mac.yaml +++ /dev/null @@ -1,69 +0,0 @@ -type: Group -instructions: - - type: SetBuildDirectory - directory: "{{.SourceDir}}/examples/qml/qmldom" - - type: MakeDirectory - directory: "{{.BuildDir}}/qt63" - - type: ChangeDirectory - directory: "{{.BuildDir}}/qt63" - - type: EnvironmentVariable - variableName: CONFIGURE_ENV_PREFIX - variableValue: "{{.Env.ENV_PREFIX}}" - - type: ExecuteCommand - command: "curl -s http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.2-final-released/Qt/qtbase/qtbase-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z -o qtbase.7z" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - download of http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.2-final-released/Qt/qtbase/qtbase-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z failed - - type: ExecuteCommand - command: "curl -s http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.2-final-released/Qt/qtdeclarative/qtdeclarative-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z -o qtdeclarative.7z" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - Download of http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.2-final-released/Qt/qtdeclarative/qtdeclarative-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z failed - - type: ExecuteCommand - command: "7za x qtbase.7z" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - Uncompress of qtbase failed. - - type: ExecuteCommand - command: "7za x qtdeclarative.7z" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - Uncompress of qtdeclarative failed. - - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake -S {{.SourceDir}}/examples/qml/qmldom -B standalone63 -DCMAKE_PREFIX_PATH={{.BuildDir}}/qt63" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - configuration of qmldom standalone on Qt 6.3 failed - - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake --build standalone63" - ignoreExitCode: false - maxTimeInSeconds: 3600 - maxTimeBetweenOutput: 1800 - userMessageOnFailure: > - Compilation of qmldom standalone on Qt 6.3 FAILED, see the log for details. - - type: ExecuteCommand - command: "./standalone63/qmldomloadeditwrite" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - Run of qmldom standalone on Qt 6.3 FAILED -enable_if: - condition: and - conditions: - - condition: property - property: target.arch - contains_value: X86_64 - - condition: property - property: target.os - contains_value: MacOS diff --git a/coin/instructions/coin_dom_standalone_old_qt_win.yaml b/coin/instructions/coin_dom_standalone_old_qt_win.yaml deleted file mode 100644 index 1c303ed2c9..0000000000 --- a/coin/instructions/coin_dom_standalone_old_qt_win.yaml +++ /dev/null @@ -1,75 +0,0 @@ -type: Group -instructions: - - type: SetBuildDirectory - directory: "{{.SourceDir}}/examples/qml/qmldom" - - type: MakeDirectory - directory: "{{.BuildDir}}/qt63" - - type: ChangeDirectory - directory: "{{.BuildDir}}/qt63" - - type: EnvironmentVariable - variableName: CONFIGURE_ENV_PREFIX - variableValue: "{{.Env.ENV_PREFIX}}" - - type: ExecuteCommand - command: "curl -s http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.2-final-released/Qt/qtbase/qtbase-Windows-Windows_10_21H2-MSVC2019-Windows-Windows_10_21H2-X86_64.7z -o qtbase.7z" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - download of http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.2-final-released/Qt/qtbase/qtbase-Windows-Windows_10_21H2-MSVC2019-Windows-Windows_10_21H2-X86_64.7z failed - - type: ExecuteCommand - command: "curl -s http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.2-final-released/Qt/qtdeclarative/qtdeclarative-Windows-Windows_10_21H2-MSVC2019-Windows-Windows_10_21H2-X86_64.7z -o qtdeclarative.7z" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - Download of http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.2-final-released/Qt/qtdeclarative/qtdeclarative-Windows-Windows_10_21H2-MSVC2019-Windows-Windows_10_21H2-X86_64.7z failed - - type: ExecuteCommand - command: "7z.exe x qtbase.7z" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - Uncompress of qtbase failed. - - type: ExecuteCommand - command: "7z.exe x qtdeclarative.7z" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - Uncompress of qtdeclarative failed. - - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake -S {{.SourceDir}}/examples/qml/qmldom -B standalone63 -DCMAKE_PREFIX_PATH={{.BuildDir}}/qt63" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - configuration of qmldom standalone on Qt 6.3 failed - - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake --build standalone63" - ignoreExitCode: false - maxTimeInSeconds: 3600 - maxTimeBetweenOutput: 1800 - userMessageOnFailure: > - Compilation of qmldom standalone on Qt 6.3 FAILED, see the log for details. - - type: PrependToEnvironmentVariable - variableName: PATH - variableValue: "{{.BuildDir}}/qt63/bin;" - - type: ExecuteCommand - command: "./standalone63/qmldomloadeditwrite" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - Run of qmldom standalone on Qt 6.3 FAILED -enable_if: - condition: and - conditions: - - condition: property - property: target.arch - contains_value: X86_64 - - condition: property - property: target.os - contains_value: Windows - - condition: property - property: target.compiler - contains_value: MSVC diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 23f6189286..9acb62722c 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -17,5 +17,3 @@ instructions: Test: - !include "{{qt/qtbase}}/coin_module_test_template_v3.yaml" - !include "{{qt/qtbase}}/coin_module_test_docs.yaml" - - !include "{{qt/qtdeclarative}}/coin_dom_standalone_old_qt_mac.yaml" - - !include "{{qt/qtdeclarative}}/coin_dom_standalone_old_qt_win.yaml" diff --git a/src/qmldom/qqmldomelements_p.h b/src/qmldom/qqmldomelements_p.h index 94d7165c8f..7ed553e8b7 100644 --- a/src/qmldom/qqmldomelements_p.h +++ b/src/qmldom/qqmldomelements_p.h @@ -28,11 +28,7 @@ #include #include -#ifdef QMLDOM_STANDALONE -# include "qmlcompiler/qqmljsscope_p.h" -#else -# include -#endif +#include #include #include diff --git a/src/qmldom/qqmldomtypesreader.cpp b/src/qmldom/qqmldomtypesreader.cpp index 227b8d0672..12cba9ae0e 100644 --- a/src/qmldom/qqmldomtypesreader.cpp +++ b/src/qmldom/qqmldomtypesreader.cpp @@ -9,11 +9,7 @@ #include #include #include -#ifdef QMLDOM_STANDALONE -# include "qmlcompiler/qqmljstypedescriptionreader_p.h" -#else -# include -#endif +#include #include diff --git a/src/qmldom/qqmldomtypesreader_p.h b/src/qmldom/qqmldomtypesreader_p.h index 7794ed16ff..d1650d726d 100644 --- a/src/qmldom/qqmldomtypesreader_p.h +++ b/src/qmldom/qqmldomtypesreader_p.h @@ -20,13 +20,9 @@ // for Q_DECLARE_TR_FUNCTIONS #include -#ifdef QMLDOM_STANDALONE -# include "qmlcompiler/qqmljsmetatypes_p.h" -# include "qmlcompiler/qqmljsscope_p.h" -#else -# include -# include -#endif +#include +#include + QT_BEGIN_NAMESPACE namespace QQmlJS { diff --git a/tests/auto/qmldom/CMakeLists.txt b/tests/auto/qmldom/CMakeLists.txt index 7e2a0b885f..f3186e2263 100644 --- a/tests/auto/qmldom/CMakeLists.txt +++ b/tests/auto/qmldom/CMakeLists.txt @@ -10,4 +10,3 @@ add_subdirectory(stringdumper) add_subdirectory(merging) add_subdirectory(reformatter) add_subdirectory(combined) -add_subdirectory(standalone) diff --git a/tests/auto/qmldom/combined/CMakeLists.txt b/tests/auto/qmldom/combined/CMakeLists.txt index 6903f89eff..203184273e 100644 --- a/tests/auto/qmldom/combined/CMakeLists.txt +++ b/tests/auto/qmldom/combined/CMakeLists.txt @@ -20,7 +20,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..25706de12f 100644 --- a/tests/auto/qmldom/combined/tst_dom_all.cpp +++ b/tests/auto/qmldom/combined/tst_dom_all.cpp @@ -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 @@ -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; diff --git a/tests/auto/qmldom/standalone/CMakeLists.txt b/tests/auto/qmldom/standalone/CMakeLists.txt deleted file mode 100644 index e141ec0835..0000000000 --- a/tests/auto/qmldom/standalone/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -##################################################################### -## tst_dom_all Binary executing all tests together -## (simpler to verify coverage) -##################################################################### -# Collect test data -file(GLOB_RECURSE test_data_glob - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/.. - domdata/*) -list(APPEND test_data ${test_data_glob}) - -set(QMLDOM_EXTERNAL_BUILD OFF CACHE BOOL "If the build is against an external Qt, and not tested inside a build of this Qt" FORCE) -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/qmldom/standalone qmldomlib) - -if(MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") -elseif (MINGW) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj") -endif() - -qt_internal_add_test(tst_standalone - SOURCES - tst_standalone.cpp - DEFINES - QT_DEPRECATED_WARNINGS - QT_QMLTEST_DATADIR="${CMAKE_CURRENT_SOURCE_DIR}/../domdata" - LIBRARIES - Qt::Core - Qt::QmlPrivate - qmldomlib - TESTDATA ${test_data} -) - -qt_internal_extend_target(tst_standalone CONDITION ANDROID OR IOS - DEFINES - QT_QMLTEST_DATADIR=":/domdata" -) diff --git a/tests/auto/qmldom/standalone/tst_standalone.cpp b/tests/auto/qmldom/standalone/tst_standalone.cpp deleted file mode 100644 index 14b6424525..0000000000 --- a/tests/auto/qmldom/standalone/tst_standalone.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// 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 - -#include "tst_standalone.h" -QTEST_MAIN(QQmlJS::Dom::TestStandalone)