From 1a65241804842e9456834d29b74f96e1d7b24cc1 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 16 Jun 2021 11:18:36 +0200 Subject: 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. Pick-to: 6.2 Task-number: QTBUG-89536 Change-Id: Ie6c3d946a7157164c3854ef22812262aa7237c4f Reviewed-by: Alexandru Croitor --- configure.json | 6 --- src/quickcontrols2/configure.json | 76 -------------------------------------- src/quicktemplates2/configure.json | 28 -------------- 3 files changed, 110 deletions(-) delete mode 100644 configure.json delete mode 100644 src/quickcontrols2/configure.json delete mode 100644 src/quicktemplates2/configure.json diff --git a/configure.json b/configure.json deleted file mode 100644 index 717877a8..00000000 --- a/configure.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "subconfigs": [ - "src/quickcontrols2", - "src/quicktemplates2" - ] -} diff --git a/src/quickcontrols2/configure.json b/src/quickcontrols2/configure.json deleted file mode 100644 index ffefe17a..00000000 --- a/src/quickcontrols2/configure.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "module": "quickcontrols2", - - "commandline": { - "options": { - "style-fusion": { "type": "boolean", "name": "quickcontrols2-fusion" }, - "style-imagine": { "type": "boolean", "name": "quickcontrols2-imagine" }, - "style-material": { "type": "boolean", "name": "quickcontrols2-material" }, - "style-universal": { "type": "boolean", "name": "quickcontrols2-universal" }, - "style-macos": { "type": "boolean", "name": "quickcontrols2-macos" }, - "style-windows": { "type": "boolean", "name": "quickcontrols2-windows" } - } - }, - - "features": { - "quickcontrols2-basic": { - "label": "Basic", - "output": [ "privateFeature" ] - }, - "quickcontrols2-fusion": { - "label": "Fusion", - "purpose": "Provides the platform agnostic desktop-oriented Fusion style.", - "section": "Quick Controls 2", - "condition": "features.quickcontrols2-basic", - "output": [ "privateFeature" ] - }, - "quickcontrols2-imagine": { - "label": "Imagine", - "purpose": "Provides a style based on configurable image assets.", - "section": "Quick Controls 2", - "condition": "features.quickcontrols2-basic", - "output": [ "privateFeature" ] - }, - "quickcontrols2-material": { - "label": "Material", - "purpose": "Provides a style based on the Material Design guidelines.", - "section": "Quick Controls 2", - "condition": "features.quickcontrols2-basic", - "output": [ "privateFeature" ] - }, - "quickcontrols2-universal": { - "label": "Universal", - "purpose": "Provides a style based on the Universal Design guidelines.", - "section": "Quick Controls 2", - "condition": "features.quickcontrols2-basic", - "output": [ "privateFeature" ] - }, - "quickcontrols2-macos": { - "label": "macOS", - "purpose": "Provides a native macOS desktop style.", - "section": "Quick Controls 2", - "condition": "features.quickcontrols2-basic", - "output": [ "privateFeature" ] - }, - "quickcontrols2-windows": { - "label": "Windows", - "purpose": "Provides a native Windows desktop style.", - "section": "Quick Controls 2", - "condition": "features.quickcontrols2-basic", - "output": [ "privateFeature" ] - } - }, - - "summary": [ - { - "section": "Qt Quick Controls 2", - "entries": [ - { - "message": "Styles", - "type": "featureList", - "args": "quickcontrols2-basic quickcontrols2-fusion quickcontrols2-imagine quickcontrols2-material quickcontrols2-universal quickcontrols2-macos quickcontrols2-windows" - } - ] - } - ] -} diff --git a/src/quicktemplates2/configure.json b/src/quicktemplates2/configure.json deleted file mode 100644 index 030e668b..00000000 --- a/src/quicktemplates2/configure.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "module": "quicktemplates2", - - "features": { - "quicktemplates2-hover": { - "label": "Hover support", - "purpose": "Provides support for hover effects.", - "section": "Quick Templates 2", - "output": [ "privateFeature" ] - }, - "quicktemplates2-multitouch": { - "label": "Multi-touch support", - "purpose": "Provides support for multi-touch.", - "section": "Quick Templates 2", - "output": [ "privateFeature" ] - } - }, - - "summary": [ - { - "section": "Qt Quick Templates 2", - "entries": [ - "quicktemplates2-hover", - "quicktemplates2-multitouch" - ] - } - ] -} -- cgit v1.2.3