diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-06-16 11:18:35 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-17 16:49:13 +0000 |
commit | 8b1aac91f0c4a310059ec401ac09171b4c1db4ab (patch) | |
tree | 5cfd74622372336bbbf72a59e293dfd007d6d2f5 | |
parent | 0909959835b8f372fe298de66e2be5ecf64287c2 (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: Ic49fc29fa36c98d15385d8c94542d5cdc5598520
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 0bd8c0a36e8ccff03af7f6990298238455443ec4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | configure.json | 5 | ||||
-rw-r--r-- | src/multimedia/configure.json | 216 |
2 files changed, 0 insertions, 221 deletions
diff --git a/configure.json b/configure.json deleted file mode 100644 index 12ae19834..000000000 --- a/configure.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "subconfigs": [ - "src/multimedia" - ] -} diff --git a/src/multimedia/configure.json b/src/multimedia/configure.json deleted file mode 100644 index e29a35e97..000000000 --- a/src/multimedia/configure.json +++ /dev/null @@ -1,216 +0,0 @@ -{ - "module": "multimedia", - "depends": [ - "gui" - ], - "condition": "module.gui", - "testDir": "../../config.tests", - - "commandline": { - "options": { - "alsa": "boolean", - "evr": { "type": "boolean" }, - "wmf": { "type": "boolean" }, - "gstreamer": { "type": "optionalString", "values": [ "no", "yes" ] }, - "pulseaudio": "boolean" - } - }, - - "libraries": { - "alsa": { - "label": "ALSA", - "test": "alsa", - "sources": [ - "-lasound" - ] - }, - "avfoundation": { - "label": "AVFoundation", - "test": "avfoundation", - "sources": [ - { "libs": "-framework AVFoundation -framework Foundation" } - ] - }, - "gstreamer_1_0": { - "label": "GStreamer 1.0", - "export": "gstreamer", - "test": "gstreamer", - "sources": [ - { "type": "pkgConfig", - "args": "gstreamer-1.0 gstreamer-base-1.0 gstreamer-audio-1.0 gstreamer-video-1.0 gstreamer-pbutils-1.0 gstreamer-allocators-1.0" }, - { "libs": "-lgstreamer-1.0 -lgstbase-1.0 -lgstaudio-1.0 -lgstvideo-1.0 -lgstpbutils-1.0 -lglib-2.0 -lgobject-2.0", - "condition": "config.win32 || config.macos" }, - { "libs": "", "condition": "config.android && input.gstreamer != ''" } - ] - }, - "gstreamer_app_1_0": { - "label": "GStreamer App 1.0", - "export": "gstreamer_app", - "test": "gstreamer_appsrc", - "use": "gstreamer_1_0", - "sources": [ - { "type": "pkgConfig", "args": "gstreamer-app-1.0" }, - { "libs": "-lgstapp-1.0", "condition": "config.win32 || config.macos" }, - { "libs": "", "condition": "config.android && input.gstreamer != ''" } - ] - }, - "gstreamer_photography_1_0": { - "label": "GStreamer Photography 1.0", - "export": "gstreamer_photography", - "test": "gstreamer_photography", - "use": "gstreamer_1_0", - "sources": [ - { "libs": "-lgstphotography-1.0" } - ] - }, - "gstreamer_gl_1_0": { - "label": "GStreamer OpenGL 1.0", - "export": "gstreamer_gl", - "test": { - "include": "gst/gl/gl.h" - }, - "use": "gstreamer_1_0", - "sources": [ - { "type": "pkgConfig", "args": "gstreamer-gl-1.0" } - ] - }, - "mmrenderer": { - "label": "MMRenderer", - "test": "mmrenderer", - "sources": [ - { "libs": "-lmmrndclient -lstrm" } - ] - }, - "pulseaudio": { - "label": "PulseAudio >= 0.9.10", - "test": "pulseaudio", - "sources": [ - { "type": "pkgConfig", "args": "libpulse >= 0.9.10 libpulse-mainloop-glib" } - ] - }, - "wmf": { - "label": "WMF", - "test": "wmf", - "sources": [ - { "libs": "-lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32 -lMf -lMfuuid -lMfplat -lPropsys" } - ] - } - }, - - "tests": { - "evr": { - "label": "evr.h", - "type": "compile", - "test": "evr" - }, - "gpu_vivante": { - "label": "Vivante GPU", - "type": "compile", - "test": "gpu_vivante" - }, - "linux_v4l": { - "label": "Video for Linux", - "type": "compile", - "test": "linux_v4l" - }, - "wmsdk": { - "label": "wmsdk.h", - "type": "compile", - "test": "wmsdk" - } - }, - - "features": { - "alsa": { - "label": "ALSA", - "condition": "config.unix && !config.qnx && libs.alsa && !features.gstreamer && !features.pulseaudio", - "output": [ "feature", "privateFeature" ] - }, - "avfoundation": { - "label": "AVFoundation", - "condition": "libs.avfoundation", - "output": [ "feature", "privateFeature" ] - }, - "evr": { - "label": "evr.h", - "condition": "config.win32 && tests.evr", - "output": [ "feature", "privateFeature" ] - }, - "gstreamer_1_0": { - "label": "GStreamer 1.0", - "disable": "input.gstreamer == 'no'", - "enable": "input.gstreamer == 'yes'", - "condition": "libs.gstreamer_1_0", - "output": [ "privateFeature" ] - }, - "gstreamer": { - "condition": "features.gstreamer_1_0", - "output": [ "privateFeature" ] - }, - "gstreamer_app": { - "label": "GStreamer App", - "condition": "(features.gstreamer_1_0 && libs.gstreamer_app_1_0)", - "output": [ "privateFeature" ] - }, - "gstreamer_photography": { - "label": "GStreamer Photography", - "condition": "(features.gstreamer_1_0 && libs.gstreamer_photography_1_0)", - "output": [ "privateFeature" ] - }, - "gstreamer_gl": { - "label": "GStreamer OpenGL", - "condition": "features.opengl && features.gstreamer_1_0 && libs.gstreamer_gl_1_0", - "output": [ "privateFeature" ] - }, - "gpu_vivante": { - "label": "Vivante GPU", - "condition": "features.gui && features.opengles2 && tests.gpu_vivante", - "output": [ "privateFeature" ] - }, - "linux_v4l": { - "label": "Video for Linux", - "condition": "config.unix && tests.linux_v4l", - "output": [ "privateFeature" ] - }, - "mmrenderer": { - "label": "MMRenderer", - "emitIf": "config.qnx", - "condition": "libs.mmrenderer", - "output": [ "feature", "privateFeature" ] - }, - "pulseaudio": { - "label": "PulseAudio", - "autoDetect": "config.unix", - "condition": "libs.pulseaudio && !features.gstreamer", - "output": [ "feature", "privateFeature" ] - }, - "wmsdk": { - "label": "wmsdk.h", - "condition": "config.win32 && tests.wmsdk", - "output": [ "privateFeature" ] - }, - "wmf": { - "label": "Windows Media Foundation", - "condition": "config.win32 && libs.wmf", - "output": [ "privateFeature" ] - } - }, - - "report": [ - ], - - "summary": [ - { - "section": "Qt Multimedia", - "entries": [ - "alsa", - "gstreamer_1_0", - "linux_v4l", - "pulseaudio", - "mmrenderer", - "avfoundation", - "wmf" - ] - } - ] -} |