diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-12-17 14:55:57 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-01-07 15:32:28 +0100 |
commit | ad2da2d27a590333fc89a56fc58700a09c3017b3 (patch) | |
tree | 7d916e7a15150d1ba3ca4af7f167e33f9d3c6cc6 /tests/auto/tools | |
parent | fca3ea040c9d05f112c6fc018f0c8e8c68892642 (diff) |
Remove the qmake project files
Remove the qmake project files for most of Qt.
Leave the qmake project files for examples, because we still test those
in the CI to ensure qmake does not regress.
Also leave the qmake project files for utils and other minor parts that
lack CMake project files.
Task-number: QTBUG-88742
Change-Id: I6cdf059e6204816f617f9624f3ea9822703f73cc
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'tests/auto/tools')
-rw-r--r-- | tests/auto/tools/moc/moc.pro | 105 | ||||
-rw-r--r-- | tests/auto/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 9 | ||||
-rw-r--r-- | tests/auto/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 4 | ||||
-rw-r--r-- | tests/auto/tools/qmake/qmake.pro | 8 | ||||
-rw-r--r-- | tests/auto/tools/qmakelib/qmakelib.pro | 25 | ||||
-rw-r--r-- | tests/auto/tools/rcc/rcc.pro | 12 | ||||
-rw-r--r-- | tests/auto/tools/tools.pro | 11 | ||||
-rw-r--r-- | tests/auto/tools/uic/uic.pro | 6 |
8 files changed, 0 insertions, 180 deletions
diff --git a/tests/auto/tools/moc/moc.pro b/tests/auto/tools/moc/moc.pro deleted file mode 100644 index 5bcde6c883..0000000000 --- a/tests/auto/tools/moc/moc.pro +++ /dev/null @@ -1,105 +0,0 @@ -CONFIG += testcase -TARGET = tst_moc - -#exists(/usr/include/boost/spirit.hpp) { -# message("including boost headers in test") -# DEFINES += PARSE_BOOST -# # need to add explicitly so that it ends up in moc's search path -# INCLUDEPATH += /usr/include -#} - -INCLUDEPATH += testproject/include testproject - -cross_compile: DEFINES += MOC_CROSS_COMPILED - -HEADERS += using-namespaces.h no-keywords.h task87883.h c-comments.h backslash-newlines.h oldstyle-casts.h \ - slots-with-void-template.h qinvokable.h namespaced-flags.h trigraphs.h \ - escapes-in-string-literals.h cstyle-enums.h qprivateslots.h gadgetwithnoenums.h \ - dir-in-include-path.h single_function_keyword.h task192552.h \ - task234909.h task240368.h pure-virtual-signals.h cxx11-enums.h \ - cxx11-final-classes.h \ - cxx11-explicit-override-control.h \ - forward-declared-param.h \ - parse-defines.h \ - function-with-attributes.h \ - plugin_metadata.h \ - single-quote-digit-separator-n3781.h \ - related-metaobjects-in-namespaces.h \ - qtbug-35657-gadget.h \ - non-gadget-parent-class.h grand-parent-gadget-class.h \ - related-metaobjects-in-gadget.h \ - related-metaobjects-name-conflict.h \ - namespace.h cxx17-namespaces.h \ - cxx-attributes.h \ - enum_inc.h enum_with_include.h \ - pointery_to_incomplete.h \ - moc_include.h - -# No platform specifics in the JSON files, so that we can compare them -JSON_HEADERS = $$HEADERS -JSON_HEADERS -= cxx-attributes.h -JSON_HEADERS -= enum_inc.h - -if(*-g++*|*-icc*|*-clang*|*-llvm):!win32-*: HEADERS += os9-newlines.h win-newlines.h -if(*-g++*|*-clang*): HEADERS += dollars.h -SOURCES += tst_moc.cpp - -QT = core testlib -qtHaveModule(dbus): QT += dbus -qtHaveModule(concurrent): QT += concurrent -qtHaveModule(network): QT += network -qtHaveModule(sql): QT += sql - -# tst_Moc::specifyMetaTagsFromCmdline() -# Ensure that plugin_metadata.h are moc-ed with some extra -M arguments: -QMAKE_MOC_OPTIONS += -Muri=com.company.app -Muri=com.company.app.private - -# Define macro on the command lines used in parse-defines.h -QMAKE_MOC_OPTIONS += "-DDEFINE_CMDLINE_EMPTY=" "\"-DDEFINE_CMDLINE_SIGNAL=void cmdlineSignal(const QMap<int, int> &i)\"" - -QMAKE_MOC_OPTIONS += --output-json - -debug_and_release { - CONFIG(debug, debug|release) { - MOC_CPP_DIR = $$MOC_DIR/debug - } else { - MOC_CPP_DIR = $$MOC_DIR/release - } -} else { - MOC_CPP_DIR = $$MOC_DIR -} - -moc_json_header.input = JSON_HEADERS -moc_json_header.output = $$MOC_CPP_DIR/$${QMAKE_H_MOD_MOC}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_CPP)}.json -moc_json_header.CONFIG = no_link moc_verify -moc_json_header.depends = $$MOC_CPP_DIR/$${QMAKE_H_MOD_MOC}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_CPP)} -moc_json_header.commands = $$escape_expand(\\n) # force creation of rule -moc_json_header.variable_out = MOC_JSON_HEADERS - -BASELINE_IN = allmocs_baseline_in.json -copy_baseline.commands = $${QMAKE_COPY} $$shell_path(${QMAKE_FILE_NAME}) ${QMAKE_FILE_OUT} -copy_baseline.input = BASELINE_IN -copy_baseline.output = $$OUT_PWD/allmocs_baseline.json -copy_baseline.CONFIG = no_link - -qtPrepareTool(MOC_COLLECT_JSON, moc) -jsoncollector.CONFIG += combine -jsoncollector.commands = $$MOC_COLLECT_JSON --collect-json -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} -jsoncollector.input = MOC_JSON_HEADERS -jsoncollector.output = $$OUT_PWD/allmocs.json -jsoncollector.variable_out = GENERATED_FILES - -allmocs_contents = \ - "<!DOCTYPE RCC><RCC version=\"1.0\">"\ - "<qresource prefix=\"/\">"\ - "<file>allmocs.json</file>"\ - "<file>allmocs_baseline.json</file>"\ - "</qresource>"\ - "</RCC>" - -allmocs_file = $$OUT_PWD/allmocs.qrc - -!write_file($$allmocs_file, allmocs_contents): error() -RESOURCES += $$allmocs_file - -QMAKE_EXTRA_COMPILERS += moc_json_header copy_baseline jsoncollector diff --git a/tests/auto/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/tests/auto/tools/qdbuscpp2xml/qdbuscpp2xml.pro deleted file mode 100644 index 7389e9d44a..0000000000 --- a/tests/auto/tools/qdbuscpp2xml/qdbuscpp2xml.pro +++ /dev/null @@ -1,9 +0,0 @@ -CONFIG += testcase -QT = core testlib dbus -TARGET = tst_qdbuscpp2xml - -SOURCES += tst_qdbuscpp2xml.cpp \ - -RESOURCES += qdbuscpp2xml.qrc - -HEADERS += test1.h diff --git a/tests/auto/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/tests/auto/tools/qdbusxml2cpp/qdbusxml2cpp.pro deleted file mode 100644 index 9fc0af98b4..0000000000 --- a/tests/auto/tools/qdbusxml2cpp/qdbusxml2cpp.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -QT = core testlib -TARGET = tst_qdbusxml2cpp -SOURCES += tst_qdbusxml2cpp.cpp diff --git a/tests/auto/tools/qmake/qmake.pro b/tests/auto/tools/qmake/qmake.pro deleted file mode 100644 index adb73b5e55..0000000000 --- a/tests/auto/tools/qmake/qmake.pro +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG += testcase -# Allow more time since examples are compiled, which may take longer on Windows. -win32:testcase.timeout=900 -TARGET = tst_qmake -HEADERS += testcompiler.h -SOURCES += tst_qmake.cpp testcompiler.cpp -QT = core testlib -TESTDATA += testdata/* diff --git a/tests/auto/tools/qmakelib/qmakelib.pro b/tests/auto/tools/qmakelib/qmakelib.pro deleted file mode 100644 index b737ebf6fa..0000000000 --- a/tests/auto/tools/qmakelib/qmakelib.pro +++ /dev/null @@ -1,25 +0,0 @@ -CONFIG += testcase -TARGET = tst_qmakelib -QT = core testlib core-private -win32: LIBS += -ladvapi32 - -INCLUDEPATH += ../../../../qmake/library -VPATH += ../../../../qmake/library - -HEADERS += \ - tst_qmakelib.h - -SOURCES += \ - tst_qmakelib.cpp \ - parsertest.cpp \ - evaltest.cpp \ - ioutils.cpp \ - registry.cpp \ - proitems.cpp \ - qmakevfs.cpp \ - qmakeparser.cpp \ - qmakeglobals.cpp \ - qmakebuiltins.cpp \ - qmakeevaluator.cpp - -DEFINES += PROPARSER_DEBUG PROEVALUATOR_FULL PROEVALUATOR_SETENV QT_USE_QSTRINGBUILDER diff --git a/tests/auto/tools/rcc/rcc.pro b/tests/auto/tools/rcc/rcc.pro deleted file mode 100644 index 3fdc4132a7..0000000000 --- a/tests/auto/tools/rcc/rcc.pro +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG += testcase -QT = core testlib -TARGET = tst_rcc - -SOURCES += tst_rcc.cpp - -RESOURCES += \ - $$PWD/data/images/images.qrc \ - $$PWD/data/sizes/size-0.qrc \ - $$PWD/data/sizes/size-2-0-35-1.qrc \ - $$PWD/data/sizes/size-1.qrc - diff --git a/tests/auto/tools/tools.pro b/tests/auto/tools/tools.pro deleted file mode 100644 index c73036aa4a..0000000000 --- a/tests/auto/tools/tools.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE=subdirs -# QTBUG-88538 -!android:!ios: SUBDIRS = \ - qmakelib \ - qmake \ - uic \ - moc \ - rcc \ - -qtHaveModule(dbus): SUBDIRS += qdbuscpp2xml qdbusxml2cpp -!qtHaveModule(widgets): SUBDIRS -= uic diff --git a/tests/auto/tools/uic/uic.pro b/tests/auto/tools/uic/uic.pro deleted file mode 100644 index 3d8b7f85cd..0000000000 --- a/tests/auto/tools/uic/uic.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase - -QT = core testlib -SOURCES += tst_uic.cpp -TARGET = tst_uic - |