aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-06-16 11:18:35 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-06-17 19:54:02 +0000
commit2f33c5abbfe1509acb4af742e9249f754e7c44c1 (patch)
treef761575a6ad35035b509b683e7307feccc034284
parent48b4f28cd3f3aadd67cd0a1aae5515db57da053a (diff)
Remove old configure-related files
Remove the configure.json and configure.pri files that were used for the qmake-based configure. Remove the .prev_*.cmake files that were a by-product of configurejson2cmake.py. Task-number: QTBUG-89536 Change-Id: I1c41256e773b0cdfdf237802d672b1140b076e99 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit ddcddbb48e5b7a275ef6e1e154d1367707815c6a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--configure.json7
-rw-r--r--src/qml/.prev_configure.cmake175
-rw-r--r--src/qml/configure.json216
-rw-r--r--src/qmlmodels/configure.json46
-rw-r--r--src/quick/configure.json203
5 files changed, 0 insertions, 647 deletions
diff --git a/configure.json b/configure.json
deleted file mode 100644
index df68a1765e..0000000000
--- a/configure.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "subconfigs": [
- "src/qml",
- "src/qmlmodels",
- "src/quick"
- ]
-}
diff --git a/src/qml/.prev_configure.cmake b/src/qml/.prev_configure.cmake
deleted file mode 100644
index b4fb15038c..0000000000
--- a/src/qml/.prev_configure.cmake
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-#### Inputs
-
-
-
-#### Libraries
-
-
-
-#### Tests
-
-# pointer_32bit
-qt_config_compile_test(pointer_32bit
- LABEL "32bit pointers"
- CODE
-"int main(void)
-{
- /* BEGIN TEST: */
-static_assert(sizeof(void *) == 4, \"fail\");
- /* END TEST: */
- return 0;
-}
-")
-
-# pointer_64bit
-qt_config_compile_test(pointer_64bit
- LABEL "64bit pointers"
- CODE
-"int main(void)
-{
- /* BEGIN TEST: */
-static_assert(sizeof(void *) == 8, \"fail\");
- /* END TEST: */
- return 0;
-}
-")
-
-# arm_thumb
-qt_config_compile_test(arm_thumb
- LABEL "THUMB mode on ARM"
- CODE
-"int main(void)
-{
- /* BEGIN TEST: */
-#if defined(thumb2) || defined(__thumb2__)
-# define THUMB_OK
-#elif (defined(__thumb) || defined(__thumb__)) && __TARGET_ARCH_THUMB-0 == 4
-# define THUMB_OK
-#elif defined(__ARM_ARCH_ISA_THUMB) && __ARM_ARCH_ISA_THUMB == 2
-// clang 3.5 and later will set this if the core supports the Thumb-2 ISA.
-# define THUMB_OK
-#else
-# error \"fail\"
-#endif
- /* END TEST: */
- return 0;
-}
-")
-
-# arm_fp
-qt_config_compile_test(arm_fp
- LABEL "Sufficiently recent FPU on ARM"
- CODE
-"int main(void)
-{
- /* BEGIN TEST: */
-// if !defined(__ARM_FP) we might be on MSVC or we might have a device
-// without an FPU.
-// TODO: The latter case is not supported, but the test still succeeds.
-#if defined(__ARM_FP) && (__ARM_FP <= 0x04)
-# error \"fail\"
-#endif
- /* END TEST: */
- return 0;
-}
-")
-
-
-
-#### Features
-
-qt_feature("qml-network" PUBLIC
- SECTION "QML"
- LABEL "QML network support"
- PURPOSE "Provides network transparency."
- CONDITION QT_FEATURE_network
-)
-# On arm and arm64 we need a specialization of cacheFlush() for each OS to be enabeled. Therefore the config white list. Also Mind that e.g. x86_32 has arch.x86_64 but 32bit pointers. Therefore the checks for architecture and pointer size. Finally, ios and tvos can technically use the JIT but Apple does not allow it. Therefore, it's disabled by default.
-qt_feature("qml-jit" PRIVATE
- SECTION "QML"
- LABEL "QML just-in-time compiler"
- PURPOSE "Provides a JIT for QML and JavaScript"
- AUTODETECT NOT IOS AND NOT TVOS
- CONDITION ( ( ( TEST_architecture_arch STREQUAL i386 ) AND TEST_pointer_32bit AND QT_FEATURE_sse2 ) OR ( ( TEST_architecture_arch STREQUAL x86_64 ) AND TEST_pointer_64bit AND QT_FEATURE_sse2 ) OR ( ( TEST_architecture_arch STREQUAL arm ) AND TEST_pointer_32bit AND TEST_arm_fp AND TEST_arm_thumb AND ( LINUX OR IOS OR TVOS OR QNX ) ) OR ( ( TEST_architecture_arch STREQUAL arm64 ) AND TEST_pointer_64bit AND TEST_arm_fp AND ( LINUX OR IOS OR TVOS OR QNX OR INTEGRITY ) ) )
-)
-qt_feature("qml-debug" PUBLIC
- SECTION "QML"
- LABEL "QML debugging and profiling support"
- PURPOSE "Provides infrastructure and plugins for debugging and profiling."
-)
-qt_feature("qml-profiler" PRIVATE
- SECTION "QML"
- LABEL "Command line QML Profiler"
- PURPOSE "Supports retrieving QML tracing data from an application."
- CONDITION ( QT_FEATURE_commandlineparser ) AND ( QT_FEATURE_qml_debug ) AND ( QT_FEATURE_qml_network AND QT_FEATURE_localserver ) AND ( QT_FEATURE_xmlstreamwriter )
-)
-qt_feature("qml-preview" PRIVATE
- SECTION "QML"
- LABEL "Command line QML Preview tool"
- PURPOSE "Updates QML documents in your application live as you change them on disk"
- CONDITION ( QT_FEATURE_commandlineparser ) AND ( QT_FEATURE_filesystemwatcher ) AND ( QT_FEATURE_qml_network AND QT_FEATURE_localserver ) AND ( QT_FEATURE_process ) AND ( QT_FEATURE_qml_debug )
-)
-qt_feature("qml-devtools" PRIVATE
- SECTION "QML"
- LABEL "QML Development Tools"
- PURPOSE "Provides the QmlDevtools library and various utilities."
-)
-qt_feature("qml-sequence-object" PRIVATE
- SECTION "QML"
- LABEL "QML sequence object"
- PURPOSE "Supports mapping sequence types into QML."
-)
-qt_feature("qml-xml-http-request" PRIVATE
- SECTION "QML"
- LABEL "QML XML http request"
- PURPOSE "Provides support for sending XML http requests."
- CONDITION ( QT_FEATURE_xmlstreamreader ) AND ( QT_FEATURE_qml_network )
-)
-qt_feature("qml-locale" PRIVATE
- SECTION "QML"
- LABEL "QML Locale"
- PURPOSE "Provides support for locales in QML."
-)
-qt_feature("qml-animation" PRIVATE
- SECTION "QML"
- LABEL "QML Animations"
- PURPOSE "Provides support for animations and timers in QML."
- CONDITION QT_FEATURE_animation
-)
-qt_feature("qml-worker-script" PRIVATE
- SECTION "QML"
- LABEL "QML WorkerScript"
- PURPOSE "Enables the use of threads in QML."
- CONDITION QT_FEATURE_thread
-)
-qt_feature("qml-itemmodel" PRIVATE
- SECTION "QML"
- LABEL "QML Item Model"
- PURPOSE "Provides the item model for item views in QML"
- CONDITION QT_FEATURE_itemmodel
-)
-qt_feature("qml-xmllistmodel" PRIVATE
- SECTION "QML"
- LABEL "QML XmlListModel"
- PURPOSE "Enable XmlListModel in QML"
- CONDITION QT_FEATURE_qml_itemmodel AND QT_FEATURE_future
-)
-qt_feature("qml-python" PRIVATE
- LABEL "python"
- CONDITION tests.qml-python OR FIXME
-)
-qt_configure_add_summary_section(NAME "Qt QML")
-qt_configure_add_summary_entry(ARGS "qml-network")
-qt_configure_add_summary_entry(ARGS "qml-debug")
-qt_configure_add_summary_entry(ARGS "qml-jit")
-qt_configure_add_summary_entry(ARGS "qml-sequence-object")
-qt_configure_add_summary_entry(ARGS "qml-xml-http-request")
-qt_configure_add_summary_entry(ARGS "qml-locale")
-qt_configure_end_summary_section() # end of "Qt QML" section
-qt_configure_add_report_entry(
- TYPE ERROR
- MESSAGE "Python is required to build QtQml."
- CONDITION NOT QT_FEATURE_qml_python
-)
diff --git a/src/qml/configure.json b/src/qml/configure.json
deleted file mode 100644
index 0bc16d31b8..0000000000
--- a/src/qml/configure.json
+++ /dev/null
@@ -1,216 +0,0 @@
-{
- "module": "qml",
- "depends": [
- "core-private",
- "network-private"
- ],
-
- "commandline": {
- "options": {
- "qml-network": "boolean",
- "qml-debug": "boolean"
- }
- },
-
- "tests": {
- "pointer_32bit": {
- "label": "32bit pointers",
- "type": "compile",
- "test": {
- "main": "static_assert(sizeof(void *) == 4, \"fail\");"
- }
- },
- "pointer_64bit": {
- "label": "64bit pointers",
- "type": "compile",
- "test": {
- "main": "static_assert(sizeof(void *) == 8, \"fail\");"
- }
- },
- "arm_thumb": {
- "label": "THUMB mode on ARM",
- "type": "compile",
- "test": {
- "main": [
- "#if defined(thumb2) || defined(__thumb2__)",
- "# define THUMB_OK",
- "#elif (defined(__thumb) || defined(__thumb__)) && __TARGET_ARCH_THUMB-0 == 4",
- "# define THUMB_OK",
- "#elif defined(__ARM_ARCH_ISA_THUMB) && __ARM_ARCH_ISA_THUMB == 2",
- "// clang 3.5 and later will set this if the core supports the Thumb-2 ISA.",
- "# define THUMB_OK",
- "#else",
- "# error \"fail\"",
- "#endif"
- ]
- }
- },
- "arm_fp": {
- "label": "Sufficiently recent FPU on ARM",
- "type": "compile",
- "test": {
- "main": [
- "// if !defined(__ARM_FP) we might be on MSVC or we might have a device",
- "// without an FPU.",
- "// TODO: The latter case is not supported, but the test still succeeds.",
- "#if defined(__ARM_FP) && (__ARM_FP <= 0x04)",
- "# error \"fail\"",
- "#endif"
- ]
- }
- },
- "qml-python": {
- "label": "python",
- "type": "detectPython",
- "log": "location"
- }
- },
-
- "features": {
- "qml-network": {
- "label": "QML network support",
- "purpose": "Provides network transparency.",
- "section": "QML",
- "condition": "features.network",
- "output": [ "publicFeature" ]
- },
- "qml-jit": {
- "label": "QML just-in-time compiler",
- "purpose": "Provides a JIT for QML and JavaScript",
- "section": "QML",
- "condition": [
- " (arch.i386 && tests.pointer_32bit && features.sse2)
- || (arch.x86_64 && tests.pointer_64bit && features.sse2)
- || (arch.arm && tests.pointer_32bit && tests.arm_fp && tests.arm_thumb
- && (config.linux || config.ios || config.tvos || config.qnx))
- || (arch.arm64 && tests.pointer_64bit && tests.arm_fp
- && (config.linux || config.ios || config.tvos || config.qnx || config.integrity))"
- ],
- "output": [ "privateFeature" ],
- "autoDetect": "!config.ios && !config.tvos",
- "comment": "On arm and arm64 we need a specialization of cacheFlush() for each OS to be
- enabeled. Therefore the config white list.
- Also Mind that e.g. x86_32 has arch.x86_64 but 32bit pointers. Therefore
- the checks for architecture and pointer size.
- Finally, ios and tvos can technically use the JIT but Apple does not allow
- it. Therefore, it's disabled by default."
- },
- "qml-debug": {
- "label": "QML debugging and profiling support",
- "purpose": "Provides infrastructure and plugins for debugging and profiling.",
- "section": "QML",
- "output": [ "publicFeature" ]
- },
- "qml-profiler": {
- "label": "Command line QML Profiler",
- "purpose": "Supports retrieving QML tracing data from an application.",
- "section": "QML",
- "condition": [
- "features.commandlineparser",
- "features.qml-debug",
- "features.qml-network && features.localserver",
- "features.xmlstreamwriter"
- ],
- "output": [ "privateFeature" ]
- },
- "qml-preview": {
- "label": "Command line QML Preview tool",
- "purpose": "Updates QML documents in your application live as you change them on disk",
- "section": "QML",
- "condition": [
- "features.commandlineparser",
- "features.filesystemwatcher",
- "features.qml-network && features.localserver",
- "features.process",
- "features.qml-debug"
- ],
- "output": [ "privateFeature" ]
- },
- "qml-devtools": {
- "label": "QML Development Tools",
- "purpose": "Provides the QmlDevtools library and various utilities.",
- "section": "QML",
- "output": [ "privateFeature" ]
- },
- "qml-sequence-object": {
- "label": "QML sequence object",
- "purpose": "Supports mapping sequence types into QML.",
- "section": "QML",
- "output": [ "privateFeature" ]
- },
- "qml-xml-http-request": {
- "label": "QML XML http request",
- "purpose": "Provides support for sending XML http requests.",
- "section": "QML",
- "condition": [
- "features.xmlstreamreader",
- "features.qml-network"
- ],
- "output": [ "privateFeature" ]
- },
- "qml-locale": {
- "label": "QML Locale",
- "purpose": "Provides support for locales in QML.",
- "section": "QML",
- "output": [ "privateFeature" ]
- },
- "qml-animation": {
- "label": "QML Animations",
- "purpose": "Provides support for animations and timers in QML.",
- "section": "QML",
- "condition": "features.animation",
- "output": [ "privateFeature" ]
- },
- "qml-worker-script": {
- "label": "QML WorkerScript",
- "purpose": "Enables the use of threads in QML.",
- "section": "QML",
- "condition": "features.thread",
- "output": [ "privateFeature" ]
- },
- "qml-itemmodel": {
- "label": "QML Item Model",
- "purpose": "Provides the item model for item views in QML",
- "section": "QML",
- "condition": "features.itemmodel",
- "output": [ "privateFeature" ]
- },
- "qml-xmllistmodel": {
- "label": "QML XmlListModel",
- "purpose": "Enable XmlListModel in QML",
- "section": "QML",
- "condition": "features.qml-itemmodel && features.future",
- "output": [ "privateFeature" ]
- },
- "qml-python": {
- "label": "python",
- "condition": "tests.qml-python",
- "output": [
- "privateFeature",
- { "type": "varAssign", "name": "QMAKE_PYTHON", "value": "tests.qml-python.location" }
- ]
- }
- },
-
- "report": [
- {
- "type": "error",
- "condition": "!features.qml-python",
- "message": "Python is required to build QtQml."
- }
- ],
-
- "summary": [
- {
- "section": "Qt QML",
- "entries": [
- "qml-network",
- "qml-debug",
- "qml-jit",
- "qml-sequence-object",
- "qml-xml-http-request",
- "qml-locale"
- ]
- }
- ]
-}
diff --git a/src/qmlmodels/configure.json b/src/qmlmodels/configure.json
deleted file mode 100644
index 1ccca5e35e..0000000000
--- a/src/qmlmodels/configure.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "module": "qmlmodels",
- "depends": [
- "core-private",
- "qml-private"
- ],
-
- "features": {
- "qml-object-model" : {
- "label": "QML object model",
- "purpose": "Provides the ObjectModel and Instantiator QML types.",
- "section": "QML",
- "output": [ "privateFeature" ]
- },
- "qml-list-model": {
- "label": "QML list model",
- "purpose": "Provides the ListModel QML type.",
- "section": "QML",
- "condition": "features.qml-itemmodel",
- "output": [ "privateFeature" ]
- },
- "qml-delegate-model": {
- "label": "QML delegate model",
- "purpose": "Provides the DelegateModel QML type.",
- "section": "QML",
- "condition": "features.qml-object-model && features.qml-itemmodel",
- "output": [ "privateFeature" ]
- },
- "qml-table-model": {
- "label": "QML table model",
- "purpose": "Provides the TableModel QML type.",
- "section": "QML",
- "condition": "features.qml-itemmodel && features.qml-delegate-model",
- "output": [ "privateFeature" ]
- }
- },
- "summary": [
- {
- "section": "Qt QML Models",
- "entries": [
- "qml-list-model",
- "qml-delegate-model"
- ]
- }
- ]
-}
diff --git a/src/quick/configure.json b/src/quick/configure.json
deleted file mode 100644
index d29f8e3eaf..0000000000
--- a/src/quick/configure.json
+++ /dev/null
@@ -1,203 +0,0 @@
-{
- "module": "quick",
- "depends": [
- "core-private",
- "qml-private",
- "gui",
- "gui-private",
- "qmlmodels-private"
- ],
- "condition": "module.gui",
- "testDir": "../../config.tests",
-
- "commandline": {
- "options": {
- "quick-animatedimage": "boolean",
- "quick-canvas": "boolean",
- "quick-designer": "boolean",
- "quick-flipable": "boolean",
- "quick-gridview": "boolean",
- "quick-listview": "boolean",
- "quick-tableview": "boolean",
- "quick-path": "boolean",
- "quick-pathview": "boolean",
- "quick-positioners": "boolean",
- "quick-shadereffect": "boolean",
- "quick-sprite": "boolean"
- }
- },
-
- "features": {
- "quick-animatedimage": {
- "label": "AnimatedImage item",
- "purpose": "Provides the AnimatedImage item.",
- "section": "Qt Quick",
- "condition": "module.gui && features.movie",
- "output": [
- "privateFeature"
- ]
- },
- "quick-canvas": {
- "label": "Canvas item",
- "purpose": "Provides the Canvas item.",
- "section": "Qt Quick",
- "condition": "features.quick-path",
- "output": [
- "privateFeature"
- ]
- },
- "quick-designer": {
- "label": "Support for Qt Quick Designer",
- "purpose": "Provides support for the Qt Quick Designer in Qt Creator.",
- "section": "Qt Quick",
- "output": [
- "privateFeature"
- ]
- },
- "quick-flipable": {
- "label": "Flipable item",
- "purpose": "Provides the Flipable item.",
- "section": "Qt Quick",
- "output": [
- "privateFeature"
- ]
- },
- "quick-gridview": {
- "label": "GridView item",
- "purpose": "Provides the GridView item.",
- "section": "Qt Quick",
- "condition": "features.qml-delegate-model",
- "output": [
- "privateFeature"
- ]
- },
- "quick-itemview": {
- "label": "ItemView item",
- "condition": "features.quick-gridview || features.quick-listview || features.quick-tableview",
- "output": [
- "privateFeature"
- ]
- },
- "quick-viewtransitions": {
- "label": "Transitions required for ItemViews and Positioners",
- "condition": "features.quick-itemview || features.quick-positioners",
- "output": [
- "privateFeature"
- ]
- },
- "quick-listview": {
- "label": "ListView item",
- "purpose": "Provides the ListView item.",
- "section": "Qt Quick",
- "condition": "features.qml-delegate-model",
- "output": [
- "privateFeature"
- ]
- },
- "quick-tableview": {
- "label": "TableView item",
- "purpose": "Provides the TableView item.",
- "section": "Qt Quick",
- "condition": "features.qml-table-model",
- "output": [
- "privateFeature"
- ]
- },
- "quick-particles": {
- "label": "Particle support",
- "purpose": "Provides a particle system.",
- "section": "Qt Quick",
- "condition": "module.gui && features.quick-shadereffect && features.quick-sprite",
- "output": [
- "privateFeature"
- ]
- },
- "quick-path": {
- "label": "Path support",
- "purpose": "Provides Path elements.",
- "section": "Qt Quick",
- "condition": "module.gui",
- "output": [
- "privateFeature"
- ]
- },
- "quick-pathview": {
- "label": "PathView item",
- "purpose": "Provides the PathView item.",
- "section": "Qt Quick",
- "condition": [
- "features.qml-delegate-model",
- "features.quick-path"
- ],
- "output": [
- "privateFeature"
- ]
- },
- "quick-positioners": {
- "label": "Positioner items",
- "purpose": "Provides Positioner items.",
- "section": "Qt Quick",
- "output": [
- "privateFeature"
- ]
- },
- "quick-repeater": {
- "label": "Repeater item",
- "purpose": "Provides the Repeater item.",
- "section": "Qt Quick",
- "condition": "features.qml-delegate-model",
- "output": [
- "privateFeature"
- ]
- },
- "quick-shadereffect": {
- "label": "ShaderEffect item",
- "purpose": "Provides Shader effects.",
- "section": "Qt Quick",
- "output": [
- "privateFeature"
- ]
- },
- "quick-sprite": {
- "label": "Sprite item",
- "purpose": "Provides the Sprite item.",
- "section": "Qt Quick",
- "output": [
- "privateFeature"
- ]
- },
- "quick-draganddrop": {
- "label": "Drag & Drop",
- "purpose": "Drag and drop support for Qt Quick",
- "section": "Qt Quick",
- "condition": [
- "features.draganddrop",
- "features.regularexpression"
- ],
- "output": [
- "publicFeature"
- ]
- }
- },
-
- "summary": [
- {
- "section": "Qt Quick",
- "entries": [
- "quick-animatedimage",
- "quick-canvas",
- "quick-designer",
- "quick-flipable",
- "quick-gridview",
- "quick-listview",
- "quick-tableview",
- "quick-path",
- "quick-pathview",
- "quick-positioners",
- "quick-repeater",
- "quick-shadereffect",
- "quick-sprite"
- ]
- }
- ]
-}