diff options
author | Juha Vuolle <juha.vuolle@insta.fi> | 2021-02-17 18:57:17 +0200 |
---|---|---|
committer | Juha Vuolle <juha.vuolle@insta.fi> | 2021-02-22 16:13:10 +0200 |
commit | de100325962a45a006e48af046b41cbab281e779 (patch) | |
tree | b05acc711a35c6e41766e5abfae39683e7602581 /tools | |
parent | 02eef0718e76d06e072e3013ec6879cae37b8a56 (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 'tools')
-rw-r--r-- | tools/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tools/qscxmlc/.prev_CMakeLists.txt | 49 | ||||
-rw-r--r-- | tools/qscxmlc/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tools/qscxmlc/qscxmlc.pri | 32 | ||||
-rw-r--r-- | tools/qscxmlc/qscxmlc.pro | 16 | ||||
-rw-r--r-- | tools/tools.pro | 2 |
6 files changed, 0 insertions, 101 deletions
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 3d0405c..9726a78 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,4 +1,3 @@ -# Generated from tools.pro. if(QT_FEATURE_commandlineparser) add_subdirectory(qscxmlc) diff --git a/tools/qscxmlc/.prev_CMakeLists.txt b/tools/qscxmlc/.prev_CMakeLists.txt deleted file mode 100644 index eb2eab8..0000000 --- a/tools/qscxmlc/.prev_CMakeLists.txt +++ /dev/null @@ -1,49 +0,0 @@ -# Generated from qscxmlc.pro. - -##################################################################### -## qscxmlc Tool: -##################################################################### - -qt_get_tool_target_name(target_name qscxmlc) -qt_add_tool(${target_name} - SOURCES - ../../src/scxml/qscxmlcompiler.cpp ../../src/scxml/qscxmlcompiler.h ../../src/scxml/qscxmlcompiler_p.h - ../../src/scxml/qscxmlerror.cpp ../../src/scxml/qscxmlerror.h - ../../src/scxml/qscxmlexecutablecontent.cpp ../../src/scxml/qscxmlexecutablecontent.h ../../src/scxml/qscxmlexecutablecontent_p.h - ../../src/scxml/qscxmlglobals.h - ../../src/scxml/qscxmltabledata.cpp ../../src/scxml/qscxmltabledata.h - generator.cpp generator.h - main.cpp - moc.h - outputrevision.h - qscxmlc.cpp qscxmlc.h - scxmlcppdumper.cpp scxmlcppdumper.h - utils.h - DEFINES - BUILD_QSCXMLC - QT_NO_CAST_FROM_ASCII - QT_NO_CAST_TO_ASCII - INCLUDE_DIRECTORIES - .scxml.includes - .scxml_private.includes - PUBLIC_LIBRARIES - Qt::CorePrivate -) - -# Resources: -set(templates_resource_files - "cppdatamodel.t" - "data.t" - "decl.t" -) - -qt_add_resource(${target_name} "templates" - PREFIX - "/" - FILES - ${templates_resource_files} -) - - -#### Keys ignored in scope 1:.:.:qscxmlc.pro:<TRUE>: -# _OPTION = "host_build" diff --git a/tools/qscxmlc/CMakeLists.txt b/tools/qscxmlc/CMakeLists.txt index 15411a0..a2d4f54 100644 --- a/tools/qscxmlc/CMakeLists.txt +++ b/tools/qscxmlc/CMakeLists.txt @@ -1,4 +1,3 @@ -# Generated from qscxmlc.pro. ##################################################################### ## qscxmlc Tool: diff --git a/tools/qscxmlc/qscxmlc.pri b/tools/qscxmlc/qscxmlc.pri deleted file mode 100644 index 4c7c991..0000000 --- a/tools/qscxmlc/qscxmlc.pri +++ /dev/null @@ -1,32 +0,0 @@ -DEFINES += BUILD_QSCXMLC - -SOURCES += \ - $$PWD/generator.cpp \ - $$PWD/qscxmlc.cpp \ - $$PWD/scxmlcppdumper.cpp - -HEADERS += \ - $$PWD/moc.h \ - $$PWD/generator.h \ - $$PWD/outputrevision.h \ - $$PWD/qscxmlc.h \ - $$PWD/utils.h \ - $$PWD/scxmlcppdumper.h - -HEADERS += \ - $$PWD/../../src/scxml/qscxmlcompiler.h \ - $$PWD/../../src/scxml/qscxmlcompiler_p.h \ - $$PWD/../../src/scxml/qscxmlglobals.h \ - $$PWD/../../src/scxml/qscxmlexecutablecontent.h \ - $$PWD/../../src/scxml/qscxmlexecutablecontent_p.h \ - $$PWD/../../src/scxml/qscxmlerror.h \ - $$PWD/../../src/scxml/qscxmltabledata.h - -SOURCES += \ - $$PWD/../../src/scxml/qscxmlcompiler.cpp \ - $$PWD/../../src/scxml/qscxmlexecutablecontent.cpp \ - $$PWD/../../src/scxml/qscxmlerror.cpp \ - $$PWD/../../src/scxml/qscxmltabledata.cpp - -DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII -INCLUDEPATH *= $$QT.scxml.includes $$QT.scxml_private.includes diff --git a/tools/qscxmlc/qscxmlc.pro b/tools/qscxmlc/qscxmlc.pro deleted file mode 100644 index 7620d3d..0000000 --- a/tools/qscxmlc/qscxmlc.pro +++ /dev/null @@ -1,16 +0,0 @@ -option(host_build) - -QT = core-private - -include(qscxmlc.pri) - -TARGET = qscxmlc -CONFIG += console c++11 - -SOURCES += \ - main.cpp - -load(qt_tool) -load(resources) - -RESOURCES += templates.qrc diff --git a/tools/tools.pro b/tools/tools.pro deleted file mode 100644 index 6884612..0000000 --- a/tools/tools.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -qtConfig(commandlineparser): SUBDIRS = qscxmlc |