summaryrefslogtreecommitdiffstats
path: root/tests/auto/scion
diff options
context:
space:
mode:
authorJuha Vuolle <juha.vuolle@insta.fi>2021-02-17 18:57:17 +0200
committerJuha Vuolle <juha.vuolle@insta.fi>2021-02-22 16:13:10 +0200
commitde100325962a45a006e48af046b41cbab281e779 (patch)
treeb05acc711a35c6e41766e5abfae39683e7602581 /tests/auto/scion
parent02eef0718e76d06e072e3013ec6879cae37b8a56 (diff)
Remove qtcxml repo qmake build support (examples excepted)
Remove qmake support by removing *.pr? files, with some exceptions: - Keep qmake support for the examples - Keeps qscxmlc.prf to retain STATECHARTS support for .pro files Also remove: - "#special case" and "# Generated from" comments from cmake files - .prev_CMakeLists.txt files Note: configure.json files are still kept as they still used to generate the configure.cmake Pick-to: 6.1 Task-number: QTBUG-89828 Change-Id: Ie9c7e86d099bbdc535f52b9f3e841fcf3973ca36 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/scion')
-rw-r--r--tests/auto/scion/.prev_CMakeLists.txt50
-rw-r--r--tests/auto/scion/CMakeLists.txt1
-rw-r--r--tests/auto/scion/scion.pro103
3 files changed, 0 insertions, 154 deletions
diff --git a/tests/auto/scion/.prev_CMakeLists.txt b/tests/auto/scion/.prev_CMakeLists.txt
deleted file mode 100644
index 9e17424..0000000
--- a/tests/auto/scion/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-# Generated from scion.pro.
-
-#####################################################################
-## tst_scion Test:
-#####################################################################
-
-qt_add_test(tst_scion
- SOURCES
- tst_scion.cpp
- DEFINES
- QT_NO_CAST_FROM_ASCII
- QT_NO_CAST_TO_ASCII
- PUBLIC_LIBRARIES
- Qt::Gui
- Qt::Qml
- Qt::Scxml
-)
-#### Ignored generated resource: ${CMAKE_CURRENT_BINARY_DIR}/scion.qrc
-#### Keys ignored in scope 1:.:.:scion.pro:<TRUE>:
-# ALLFILES = "$$SCXMLS_DIR/*.*,"
-# ALLSCXMLS = "$$SCXMLS_DIR/*.scxml,"
-# BLACKLISTED = "test216sub1.scxml" "test226sub1.txml" "test239sub1.scxml" "test242sub1.scxml" "test276sub1.scxml" "test530.txml.scxml" "test301.txml.scxml" "test441a.txml.scxml" "test441b.txml.scxml" "test557.txml.scxml"
-# QMAKE_EXTRA_COMPILERS = "myscxml" "myscxml_hdr"
-# SCXMLS_DIR = "$$absolute_path($$PWD/../../3rdparty/scion-tests/scxml-test-framework/test)"
-# TEMPLATE = "app"
-# contents = "'<!DOCTYPE" "RCC><RCC" "version=\"1.0\">'" "'<qresource>'" "$$qrc" "'</qresource></RCC>'"
-# myscxml.commands = "$$QMAKE_QSCXMLC" "--header" "scxml/${QMAKE_FUNC_nameTheNamespace}_${QMAKE_FILE_IN_BASE}.h" "--impl" "${QMAKE_FILE_OUT}" "--namespace" "${QMAKE_FUNC_nameTheNamespace}" "--classname" "${QMAKE_FUNC_nameTheClass}" "${QMAKE_FILE_IN}"
-# myscxml.depends = "$$QMAKE_QSCXMLC_EXE"
-# myscxml.input = "SCXMLS"
-# myscxml.output = "scxml/${QMAKE_FUNC_nameTheNamespace}_${QMAKE_FILE_IN_BASE}.cpp"
-# myscxml.variable_out = "SOURCES"
-# myscxml_hdr.commands = "$$escape_expand(\\n)"
-# myscxml_hdr.depends = "scxml/${QMAKE_FUNC_nameTheNamespace}_${QMAKE_FILE_IN_BASE}.cpp"
-# myscxml_hdr.input = "SCXMLS"
-# myscxml_hdr.output = "scxml/${QMAKE_FUNC_nameTheNamespace}_${QMAKE_FILE_IN_BASE}.h"
-# myscxml_hdr.variable_out = "SCXML_HEADERS"
-
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 2:.:.:scion.pro:defineReplace(nameTheNamespace):
-# sn = "__relative_path___absolute_path___dirname_1_____OUT_PWD____SCXMLS_DIR_"
-
-#### Keys ignored in scope 3:.:.:scion.pro:defineReplace(nameTheClass):
-# cn = "1"
-
-qt_extend_target(tst_scion CONDITION MSVC AND WIN32
- COMPILE_OPTIONS
- /bigobj
-)
diff --git a/tests/auto/scion/CMakeLists.txt b/tests/auto/scion/CMakeLists.txt
index 4dc91ff..8991562 100644
--- a/tests/auto/scion/CMakeLists.txt
+++ b/tests/auto/scion/CMakeLists.txt
@@ -1,4 +1,3 @@
-# Generated from scion.pro.
#####################################################################
## tst_scion Test:
diff --git a/tests/auto/scion/scion.pro b/tests/auto/scion/scion.pro
deleted file mode 100644
index 1ebc624..0000000
--- a/tests/auto/scion/scion.pro
+++ /dev/null
@@ -1,103 +0,0 @@
-QT = core gui qml testlib scxml
-CONFIG += testcase c++11 console
-CONFIG -= app_bundle
-TARGET = tst_scion
-
-TEMPLATE = app
-
-RESOURCES = $$OUT_PWD/scion.qrc
-DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
-
-SOURCES += \
- tst_scion.cpp
-
-defineReplace(nameTheNamespace) {
- sn=$$relative_path($$absolute_path($$dirname(1), $$OUT_PWD),$$SCXMLS_DIR)
- sn~=s/\\.txml$//
- sn~=s/[^a-zA-Z_0-9]/_/
- return ($$sn)
-}
-defineReplace(nameTheClass) {
- cn = $$basename(1)
- cn ~= s/\\.scxml$//
- cn ~=s/\\.txml$//
- cn ~= s/[^a-zA-Z_0-9]/_/
- return ($$cn)
-}
-
-qtPrepareTool(QMAKE_QSCXMLC, qscxmlc)
-
-win32 {
- msvc: QMAKE_CXXFLAGS += /bigobj
-}
-
-myscxml.commands = $$QMAKE_QSCXMLC --header scxml/${QMAKE_FUNC_nameTheNamespace}_${QMAKE_FILE_IN_BASE}.h --impl ${QMAKE_FILE_OUT} --namespace ${QMAKE_FUNC_nameTheNamespace} --classname ${QMAKE_FUNC_nameTheClass} ${QMAKE_FILE_IN}
-myscxml.depends += $$QMAKE_QSCXMLC_EXE
-myscxml.output = scxml/${QMAKE_FUNC_nameTheNamespace}_${QMAKE_FILE_IN_BASE}.cpp
-myscxml.input = SCXMLS
-myscxml.variable_out = SOURCES
-QMAKE_EXTRA_COMPILERS += myscxml
-
-myscxml_hdr.input = SCXMLS
-myscxml_hdr.variable_out = SCXML_HEADERS
-myscxml_hdr.commands = $$escape_expand(\\n)
-myscxml_hdr.depends = scxml/${QMAKE_FUNC_nameTheNamespace}_${QMAKE_FILE_IN_BASE}.cpp
-myscxml_hdr.output = scxml/${QMAKE_FUNC_nameTheNamespace}_${QMAKE_FILE_IN_BASE}.h
-QMAKE_EXTRA_COMPILERS += myscxml_hdr
-
-SCXMLS_DIR += $$absolute_path($$PWD/../../3rdparty/scion-tests/scxml-test-framework/test)
-ALLSCXMLS = $$files($$SCXMLS_DIR/*.scxml, true)
-
-# For a better explanation about the "blacklisted" tests, see tst_scion.cpp
-# <invoke>
-BLACKLISTED = \
- test216sub1.scxml \
- test226sub1.txml \
- test239sub1.scxml \
- test242sub1.scxml \
- test276sub1.scxml \
- test530.txml.scxml
-
-# other
-BLACKLISTED += \
- test301.txml.scxml \
- test441a.txml.scxml \
- test441b.txml.scxml \
- test557.txml.scxml
-
-for (f,ALLSCXMLS) {
- cn = $$basename(f)
- if (!contains(BLACKLISTED, $$cn)) {
- SCXMLS += $$f
-
- cn ~= s/\\.scxml$//
- hn = $$cn
- cn ~=s/\\.txml$//
- sn = $$relative_path($$dirname(f), $$SCXMLS_DIR)
- sn ~=s/[^a-zA-Z_0-9]/_/
-
- inc_list += "$${LITERAL_HASH}include \"scxml/$${sn}_$${hn}.h\""
- func_list += " []()->QScxmlStateMachine*{return new $${sn}::$${cn};},"
-
- base = $$relative_path($$f,$$absolute_path($$SCXMLS_DIR))
- tn = $$base
- tn ~= s/\\.scxml$//
- testBases += " \"$$tn\","
- }
-}
-
-ALLFILES = $$files($$SCXMLS_DIR/*.*, true)
-for (f,ALLFILES) {
- base = $$relative_path($$f,$$absolute_path($$SCXMLS_DIR))
- file = $$relative_path($$f, $$absolute_path($$OUT_PWD))
- qrc += '<file alias="$$base">$$file</file>'
-}
-
-contents = $$inc_list "std::function<QScxmlStateMachine *()> creators[] = {" $$func_list "};"
-write_file("$$OUT_PWD/scxml/compiled_tests.h", contents)|error("Aborting.")
-
-contents = "const char *testBases[] = {" $$testBases "};"
-write_file("$$OUT_PWD/scxml/scion.h", contents)|error("Aborting.")
-
-contents = '<!DOCTYPE RCC><RCC version=\"1.0\">' '<qresource>' $$qrc '</qresource></RCC>'
-write_file("$$OUT_PWD/scion.qrc", contents)|error("Aborting.")