diff options
138 files changed, 0 insertions, 2052 deletions
diff --git a/.qmake.conf b/.qmake.conf deleted file mode 100644 index 3066cd883..000000000 --- a/.qmake.conf +++ /dev/null @@ -1,5 +0,0 @@ -load(qt_build_config) - -DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS - -MODULE_VERSION = 6.0.0 diff --git a/config.tests/alsa/alsa.pro b/config.tests/alsa/alsa.pro deleted file mode 100644 index db488fe5c..000000000 --- a/config.tests/alsa/alsa.pro +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES = alsatest.cpp -CONFIG -= qt dylib - diff --git a/config.tests/avfoundation/avfoundation.pro b/config.tests/avfoundation/avfoundation.pro deleted file mode 100644 index 9ef3afea2..000000000 --- a/config.tests/avfoundation/avfoundation.pro +++ /dev/null @@ -1 +0,0 @@ -OBJECTIVE_SOURCES += main.mm diff --git a/config.tests/evr/evr.pro b/config.tests/evr/evr.pro deleted file mode 100644 index abb9ba83a..000000000 --- a/config.tests/evr/evr.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG -= qt -CONFIG += console - -SOURCES += main.cpp diff --git a/config.tests/gpu_vivante/gpu_vivante.pro b/config.tests/gpu_vivante/gpu_vivante.pro deleted file mode 100644 index 28dcadcbf..000000000 --- a/config.tests/gpu_vivante/gpu_vivante.pro +++ /dev/null @@ -1 +0,0 @@ -SOURCES += main.cpp diff --git a/config.tests/gstreamer/gstreamer.pro b/config.tests/gstreamer/gstreamer.pro deleted file mode 100644 index 3f6c64360..000000000 --- a/config.tests/gstreamer/gstreamer.pro +++ /dev/null @@ -1,2 +0,0 @@ -SOURCES += main.cpp - diff --git a/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro b/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro deleted file mode 100644 index 28dcadcbf..000000000 --- a/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro +++ /dev/null @@ -1 +0,0 @@ -SOURCES += main.cpp diff --git a/config.tests/gstreamer_photography/gstreamer_photography.pro b/config.tests/gstreamer_photography/gstreamer_photography.pro deleted file mode 100644 index 28dcadcbf..000000000 --- a/config.tests/gstreamer_photography/gstreamer_photography.pro +++ /dev/null @@ -1 +0,0 @@ -SOURCES += main.cpp diff --git a/config.tests/linux_v4l/linux_v4l.pro b/config.tests/linux_v4l/linux_v4l.pro deleted file mode 100644 index 28dcadcbf..000000000 --- a/config.tests/linux_v4l/linux_v4l.pro +++ /dev/null @@ -1 +0,0 @@ -SOURCES += main.cpp diff --git a/config.tests/mmrenderer/mmrenderer.pro b/config.tests/mmrenderer/mmrenderer.pro deleted file mode 100644 index 571b51627..000000000 --- a/config.tests/mmrenderer/mmrenderer.pro +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES = mmrenderertest.cpp -CONFIG -= qt - diff --git a/config.tests/pulseaudio/pulseaudio.pro b/config.tests/pulseaudio/pulseaudio.pro deleted file mode 100644 index ff7082390..000000000 --- a/config.tests/pulseaudio/pulseaudio.pro +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG -= qt -SOURCES = pulseaudio.cpp diff --git a/config.tests/wmf/wmf.pro b/config.tests/wmf/wmf.pro deleted file mode 100644 index abb9ba83a..000000000 --- a/config.tests/wmf/wmf.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG -= qt -CONFIG += console - -SOURCES += main.cpp diff --git a/config.tests/wmsdk/wmsdk.pro b/config.tests/wmsdk/wmsdk.pro deleted file mode 100644 index abb9ba83a..000000000 --- a/config.tests/wmsdk/wmsdk.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG -= qt -CONFIG += console - -SOURCES += main.cpp diff --git a/examples/examples.pro b/examples/examples.pro deleted file mode 100644 index 979671672..000000000 --- a/examples/examples.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += multimedia multimediawidgets - diff --git a/examples/multimedia/audiodecoder/audiodecoder.pro b/examples/multimedia/audiodecoder/audiodecoder.pro deleted file mode 100644 index b04784561..000000000 --- a/examples/multimedia/audiodecoder/audiodecoder.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app -TARGET = audiodecoder - -HEADERS = \ - audiodecoder.h \ -SOURCES = main.cpp \ - audiodecoder.cpp \ - -QT += multimedia -CONFIG += console - -target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiodecoder -INSTALLS += target diff --git a/examples/multimedia/audiodevices/audiodevices.pro b/examples/multimedia/audiodevices/audiodevices.pro deleted file mode 100644 index 55657202b..000000000 --- a/examples/multimedia/audiodevices/audiodevices.pro +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE = app -TARGET = audiodevices - -QT += multimedia - -HEADERS = audiodevices.h - -SOURCES = audiodevices.cpp \ - main.cpp - -FORMS += audiodevicesbase.ui - -target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiodevices -INSTALLS += target - -QT+=widgets -include(../shared/shared.pri) diff --git a/examples/multimedia/audioinput/audioinput.pro b/examples/multimedia/audioinput/audioinput.pro deleted file mode 100644 index 708d40d93..000000000 --- a/examples/multimedia/audioinput/audioinput.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = app -TARGET = audioinput - -QT += multimedia widgets - -HEADERS = audioinput.h - -SOURCES = audioinput.cpp \ - main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audioinput -INSTALLS += target -include(../shared/shared.pri) diff --git a/examples/multimedia/audiooutput/audiooutput.pro b/examples/multimedia/audiooutput/audiooutput.pro deleted file mode 100644 index c843f010f..000000000 --- a/examples/multimedia/audiooutput/audiooutput.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app -TARGET = audiooutput - -QT += multimedia widgets - -HEADERS = audiooutput.h - -SOURCES = audiooutput.cpp \ - main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiooutput -INSTALLS += target diff --git a/examples/multimedia/audiorecorder/audiorecorder.pro b/examples/multimedia/audiorecorder/audiorecorder.pro deleted file mode 100644 index dfd0364a4..000000000 --- a/examples/multimedia/audiorecorder/audiorecorder.pro +++ /dev/null @@ -1,23 +0,0 @@ -TEMPLATE = app -TARGET = audiorecorder - -QT += multimedia - -win32:INCLUDEPATH += $$PWD - -HEADERS = \ - audiorecorder.h \ - audiolevel.h - -SOURCES = \ - main.cpp \ - audiorecorder.cpp \ - audiolevel.cpp - -FORMS += audiorecorder.ui - -target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiorecorder -INSTALLS += target - -QT+=widgets -include(../shared/shared.pri) diff --git a/examples/multimedia/declarative-camera/declarative-camera.pro b/examples/multimedia/declarative-camera/declarative-camera.pro deleted file mode 100644 index 2d6e2e759..000000000 --- a/examples/multimedia/declarative-camera/declarative-camera.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE=app -TARGET=declarative-camera - -QT += quick qml multimedia - -SOURCES += qmlcamera.cpp -RESOURCES += declarative-camera.qrc - -target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/declarative-camera -INSTALLS += target -include(../shared/shared.pri) diff --git a/examples/multimedia/multimedia.pro b/examples/multimedia/multimedia.pro deleted file mode 100644 index a221d4bb5..000000000 --- a/examples/multimedia/multimedia.pro +++ /dev/null @@ -1,21 +0,0 @@ -TEMPLATE = subdirs -QT_FOR_CONFIG += multimedia-private - -SUBDIRS += audiodecoder - -# These examples all need widgets for now (using creator templates that use widgets) -qtHaveModule(widgets) { - SUBDIRS += \ - spectrum \ - audiorecorder \ - audiodevices \ - audioinput \ - audiooutput \ -} - -qtHaveModule(quick) { - SUBDIRS += \ - declarative-camera \ - video -} - diff --git a/examples/multimedia/shared/shared.pri b/examples/multimedia/shared/shared.pri deleted file mode 100644 index cb70f2b49..000000000 --- a/examples/multimedia/shared/shared.pri +++ /dev/null @@ -1,50 +0,0 @@ -darwin { - PRODUCT_NAME = $$TARGET - macx-xcode: PRODUCT_NAME = $${LITERAL_DOLLAR}{PRODUCT_NAME} - INFOPLIST = \ - "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" \ - "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">" \ - "<plist version=\"1.0\">" \ - "<dict>" \ - " <key>CFBundleIconFile</key>" \ - " <string></string>" \ - " <key>CFBundlePackageType</key>" \ - " <string>APPL</string>" \ - " <key>CFBundleGetInfoString</key>" \ - " <string>Created by Qt/QMake</string>" \ - " <key>CFBundleSignature</key>" \ - " <string>????</string>" \ - " <key>CFBundleExecutable</key>" \ - " <string>$$TARGET</string>" \ - " <key>CFBundleIdentifier</key>" \ - " <string>com.digia.$${LITERAL_DOLLAR}{PRODUCT_NAME:rfc1034identifier}</string>" \ - " <key>CFBundleDisplayName</key>" \ - " <string>$$PRODUCT_NAME</string>" \ - " <key>CFBundleName</key>" \ - " <string>$$PRODUCT_NAME</string>" \ - " <key>CFBundleShortVersionString</key>" \ - " <string>1.0</string>" \ - " <key>CFBundleVersion</key>" \ - " <string>1.0</string>" \ - " <key>LSRequiresIPhoneOS</key>" \ - " <true/>" \ - " <key>UILaunchStoryboardName</key>" \ - " <string>LaunchScreen</string>" \ - " <key>UISupportedInterfaceOrientations</key>" \ - " <array>" \ - " <string>UIInterfaceOrientationPortrait</string>" \ - " <string>UIInterfaceOrientationPortraitUpsideDown</string>" \ - " <string>UIInterfaceOrientationLandscapeLeft</string>" \ - " <string>UIInterfaceOrientationLandscapeRight</string>" \ - " </array>" \ - " <key>NSCameraUsageDescription</key>" \ - " <string>Qt Multimedia Example</string>" \ - " <key>NSMicrophoneUsageDescription</key>" \ - " <string>Qt Multimedia Example</string>" \ - " <key>NOTE</key>" \ - " <string>This file was generated by Qt/QMake.</string>" \ - "</dict>" \ - "</plist>" - write_file($$OUT_PWD/Info.plist, INFOPLIST)|error() - QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist -} diff --git a/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro deleted file mode 100644 index b2c96f96c..000000000 --- a/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro +++ /dev/null @@ -1,45 +0,0 @@ -include(../../spectrum.pri) - -static: error(This library cannot be built for static linkage) - -TEMPLATE = lib -TARGET = fftreal - -# FFTReal -HEADERS += Array.h \ - Array.hpp \ - DynArray.h \ - DynArray.hpp \ - FFTRealFixLen.h \ - FFTRealFixLen.hpp \ - FFTRealFixLenParam.h \ - FFTRealPassDirect.h \ - FFTRealPassDirect.hpp \ - FFTRealPassInverse.h \ - FFTRealPassInverse.hpp \ - FFTRealSelect.h \ - FFTRealSelect.hpp \ - FFTRealUseTrigo.h \ - FFTRealUseTrigo.hpp \ - OscSinCos.h \ - OscSinCos.hpp \ - def.h - -# Wrapper used to export the required instantiation of the FFTRealFixLen template -HEADERS += fftreal_wrapper.h -SOURCES += fftreal_wrapper.cpp - -DEFINES += FFTREAL_LIBRARY - -macx { - CONFIG += lib_bundle -} else { - DESTDIR = ../..$${spectrum_build_dir} -} - -EXAMPLE_FILES = bwins/fftreal.def eabi/fftreal.def readme.txt license.txt - -target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/spectrum -INSTALLS += target - -CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/multimedia/spectrum/app/app.pro b/examples/multimedia/spectrum/app/app.pro deleted file mode 100644 index 9a02766da..000000000 --- a/examples/multimedia/spectrum/app/app.pro +++ /dev/null @@ -1,84 +0,0 @@ -include(../spectrum.pri) - -TEMPLATE = app - -TARGET = spectrum - -QT += multimedia widgets - -SOURCES += main.cpp \ - engine.cpp \ - frequencyspectrum.cpp \ - levelmeter.cpp \ - mainwidget.cpp \ - progressbar.cpp \ - settingsdialog.cpp \ - spectrograph.cpp \ - spectrumanalyser.cpp \ - tonegenerator.cpp \ - tonegeneratordialog.cpp \ - utils.cpp \ - waveform.cpp \ - -HEADERS += engine.h \ - frequencyspectrum.h \ - levelmeter.h \ - mainwidget.h \ - progressbar.h \ - settingsdialog.h \ - spectrograph.h \ - spectrum.h \ - spectrumanalyser.h \ - tonegenerator.h \ - tonegeneratordialog.h \ - utils.h \ - waveform.h \ - -fftreal_dir = ../3rdparty/fftreal - -INCLUDEPATH += $${fftreal_dir} - -RESOURCES = spectrum.qrc - -# Dynamic linkage against FFTReal DLL -!contains(DEFINES, DISABLE_FFT) { - macx { - # Link to fftreal framework - LIBS += -F$${fftreal_dir} - LIBS += -framework fftreal - } else { - LIBS += -L..$${spectrum_build_dir} - LIBS += -lfftreal - } -} - -target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/spectrum -INSTALLS += target - -CONFIG += install_ok # Do not cargo-cult this! - -# Deployment - -DESTDIR = ..$${spectrum_build_dir} -macx { - !contains(DEFINES, DISABLE_FFT) { - # Relocate fftreal.framework into spectrum.app bundle - framework_dir = ../spectrum.app/Contents/Frameworks - framework_name = fftreal.framework/Versions/1/fftreal - QMAKE_POST_LINK = \ - mkdir -p $${framework_dir} &&\ - rm -rf $${framework_dir}/fftreal.framework &&\ - cp -R $${fftreal_dir}/fftreal.framework $${framework_dir} &&\ - install_name_tool -id @executable_path/../Frameworks/$${framework_name} \ - $${framework_dir}/$${framework_name} &&\ - install_name_tool -change $${framework_name} \ - @executable_path/../Frameworks/$${framework_name} \ - ../spectrum.app/Contents/MacOS/spectrum - } -} else { - linux-g++*: { - # Provide relative path from application to fftreal library - QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN - } -} -include(../../shared/shared.pri) diff --git a/examples/multimedia/spectrum/spectrum.pri b/examples/multimedia/spectrum/spectrum.pri deleted file mode 100644 index 38b3f1501..000000000 --- a/examples/multimedia/spectrum/spectrum.pri +++ /dev/null @@ -1,51 +0,0 @@ -# The following macros allow certain features and debugging output -# to be disabled / enabled at compile time. - -# Debug output from spectrum calculation -DEFINES += LOG_SPECTRUMANALYSER - -# Debug output from waveform generation -#DEFINES += LOG_WAVEFORM - -# Debug output from engine -DEFINES += LOG_ENGINE - -# Dump input data to spectrum analyer, plus artefact data files -#DEFINES += DUMP_SPECTRUMANALYSER - -# Dump captured audio data -#DEFINES += DUMP_CAPTURED_AUDIO - -# Disable calculation of level -#DEFINES += DISABLE_LEVEL - -# Disable calculation of frequency spectrum -# If this macro is defined, the FFTReal DLL will not be built -#DEFINES += DISABLE_FFT - -static: DEFINES += DISABLE_FFT - -# Disables rendering of the waveform -#DEFINES += DISABLE_WAVEFORM - -# If defined, superimpose the progress bar on the waveform -DEFINES += SUPERIMPOSE_PROGRESS_ON_WAVEFORM - -# Perform spectrum analysis calculation in a separate thread -DEFINES += SPECTRUM_ANALYSER_SEPARATE_THREAD - -# Suppress warnings about strncpy potentially being unsafe, emitted by MSVC -win32: DEFINES += _CRT_SECURE_NO_WARNINGS - -win32 { - # spectrum_build_dir is defined with a leading slash so that it can - # be used in contexts such as - # ..$${spectrum_build_dir} - # without the result having a trailing slash where spectrum_build_dir - # is undefined. - build_pass { - CONFIG(release, release|debug): spectrum_build_dir = /release - CONFIG(debug, release|debug): spectrum_build_dir = /debug - } -} - diff --git a/examples/multimedia/spectrum/spectrum.pro b/examples/multimedia/spectrum/spectrum.pro deleted file mode 100644 index 0ca2ee554..000000000 --- a/examples/multimedia/spectrum/spectrum.pro +++ /dev/null @@ -1,15 +0,0 @@ -include(spectrum.pri) - -TEMPLATE = subdirs - -# Ensure that library is built before application -CONFIG += ordered - -!contains(DEFINES, DISABLE_FFT): SUBDIRS += 3rdparty/fftreal -SUBDIRS += app - -TARGET = spectrum - -EXAMPLE_FILES += \ - README.txt \ - TODO.txt diff --git a/examples/multimedia/video/android/android.pro b/examples/multimedia/video/android/android.pro deleted file mode 100644 index 95ed21e17..000000000 --- a/examples/multimedia/video/android/android.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = subdirs - -QT_FOR_CONFIG += multimedia-private - -qtConfig(gstreamer): SUBDIRS += gstreamer diff --git a/examples/multimedia/video/android/gstreamer/gstreamer.pro b/examples/multimedia/video/android/gstreamer/gstreamer.pro deleted file mode 100644 index 0ae344678..000000000 --- a/examples/multimedia/video/android/gstreamer/gstreamer.pro +++ /dev/null @@ -1,22 +0,0 @@ -QT += quick multimedia multimediawidgets-private -CONFIG += c++11 - -SOURCES += main.cpp - -RESOURCES += qml.qrc - -target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/video/android/gstreamer -INSTALLS += target - -GSTREAMER_ROOT_ANDROID = $$(GSTREAMER_ROOT_ANDROID) -isEmpty(GSTREAMER_ROOT_ANDROID): error("GSTREAMER_ROOT_ANDROID is empty") - -INCLUDEPATH += $(GSTREAMER_ROOT_ANDROID)/armv7/include/ $(GSTREAMER_ROOT_ANDROID)/armv7/include/gstreamer-1.0 $(GSTREAMER_ROOT_ANDROID)/armv7/include/glib-2.0 $(GSTREAMER_ROOT_ANDROID)/armv7/lib/glib-2.0/include - -LIBS += -L$(GSTREAMER_ROOT_ANDROID)/armv7/lib/ -L$(GSTREAMER_ROOT_ANDROID)/armv7/lib/gstreamer-1.0 \ --lgstcoreelements -lgstplayback -lgstvideotestsrc -lgstaudioconvert -lgstvideoconvert -lgstautodetect -lgsttypefindfunctions \ -#PLUGINS codecs --lgstvorbis -lvorbis -lgstivorbisdec -lvorbisenc -lvorbisfile -lgstsubparse -lgstaudioparsers \ --lgstgio -lgstapp -lgstisomp4 -lgstavi -lgstogg -lgstwavenc -lgstwavpack -lgstwavparse -lgsttheora -lgstmpg123 -lgstx264 -lgstlibav \ --lgsttcp -lgstsoup -logg -ltheora -lmpg123 -lx264 -lavfilter -lavformat -lavcodec -lavutil -lbz2 -lswresample \ --lsoup-2.4 -lgio-2.0 -lgstrtp-1.0 -lgstriff-1.0 -lgstnet-1.0 diff --git a/examples/multimedia/video/qmlvideo/qmlvideo.pro b/examples/multimedia/video/qmlvideo/qmlvideo.pro deleted file mode 100644 index dbd3a42a1..000000000 --- a/examples/multimedia/video/qmlvideo/qmlvideo.pro +++ /dev/null @@ -1,25 +0,0 @@ -TEMPLATE = app -TARGET = qmlvideo - -QT += quick multimedia -android: qtHaveModule(androidextras) { - QT += androidextras - DEFINES += REQUEST_PERMISSIONS_ON_ANDROID -} - -LOCAL_SOURCES = main.cpp -LOCAL_HEADERS = trace.h - -SOURCES += $$LOCAL_SOURCES -HEADERS += $$LOCAL_HEADERS -RESOURCES += qmlvideo.qrc - -SNIPPETS_PATH = ../snippets -include($$SNIPPETS_PATH/performancemonitor/performancemonitordeclarative.pri) - -target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/video/qmlvideo -INSTALLS += target - -EXAMPLE_FILES += \ - qmlvideo.png \ - qmlvideo.svg diff --git a/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri b/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri deleted file mode 100644 index d9807943e..000000000 --- a/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri +++ /dev/null @@ -1,7 +0,0 @@ -QT += quick - -SOURCES += $$PWD/qmlapplicationviewer.cpp -HEADERS += $$PWD/qmlapplicationviewer.h -INCLUDEPATH += $$PWD - - diff --git a/examples/multimedia/video/qmlvideofx/qmlvideofx.pro b/examples/multimedia/video/qmlvideofx/qmlvideofx.pro deleted file mode 100644 index 07047aec8..000000000 --- a/examples/multimedia/video/qmlvideofx/qmlvideofx.pro +++ /dev/null @@ -1,24 +0,0 @@ -TEMPLATE = app -TARGET = qmlvideofx - -QT += quick multimedia -android: qtHaveModule(androidextras) { - QT += androidextras - DEFINES += REQUEST_PERMISSIONS_ON_ANDROID -} - -SOURCES += filereader.cpp main.cpp -HEADERS += filereader.h trace.h - -RESOURCES += qmlvideofx.qrc - -include($$PWD/../snippets/performancemonitor/performancemonitordeclarative.pri) - -target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/video/qmlvideofx -INSTALLS += target - -QMAKE_INFO_PLIST = Info.plist - -EXAMPLE_FILES += \ - qmlvideofx.png \ - qmlvideofx.svg diff --git a/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.pri b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.pri deleted file mode 100644 index 3ac8a08c4..000000000 --- a/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.pri +++ /dev/null @@ -1,5 +0,0 @@ -HEADERS += $$PWD/frequencymonitor.h -SOURCES += $$PWD/frequencymonitor.cpp -INCLUDEPATH += $$PWD -DEFINES += FREQUENCYMONITOR_SUPPORT - diff --git a/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.pri b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.pri deleted file mode 100644 index 071b7286a..000000000 --- a/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.pri +++ /dev/null @@ -1,5 +0,0 @@ -include($$PWD/frequencymonitor.pri) -QT += qml - -SOURCES += $$PWD/frequencymonitordeclarative.cpp -RESOURCES += $$PWD/frequencymonitordeclarative.qrc diff --git a/examples/multimedia/video/snippets/performancemonitor/performancemonitor.pri b/examples/multimedia/video/snippets/performancemonitor/performancemonitor.pri deleted file mode 100644 index 2df3cfb13..000000000 --- a/examples/multimedia/video/snippets/performancemonitor/performancemonitor.pri +++ /dev/null @@ -1,5 +0,0 @@ -INCLUDEPATH += $$PWD -HEADERS += $$PWD/performancemonitor.h -SOURCES += $$PWD/performancemonitor.cpp -DEFINES += PERFORMANCEMONITOR_SUPPORT - diff --git a/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.pri b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.pri deleted file mode 100644 index 9a18e35e5..000000000 --- a/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.pri +++ /dev/null @@ -1,6 +0,0 @@ -include($$PWD/../frequencymonitor/frequencymonitordeclarative.pri) -include($$PWD/performancemonitor.pri) - -HEADERS += $$PWD/performancemonitordeclarative.h -SOURCES += $$PWD/performancemonitordeclarative.cpp -RESOURCES += $$PWD/performancemonitordeclarative.qrc diff --git a/examples/multimedia/video/video.pro b/examples/multimedia/video/video.pro deleted file mode 100644 index ef5bc849d..000000000 --- a/examples/multimedia/video/video.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += qmlvideo qmlvideofx - -EXAMPLE_FILES += \ - qmlvideofilter_opencl \ # FIXME: this one should use a configure check instead - snippets - -android: SUBDIRS += android diff --git a/examples/multimediawidgets/camera/camera.pro b/examples/multimediawidgets/camera/camera.pro deleted file mode 100644 index edf40ed9d..000000000 --- a/examples/multimediawidgets/camera/camera.pro +++ /dev/null @@ -1,30 +0,0 @@ -TEMPLATE = app -TARGET = camera - -QT += multimedia multimediawidgets - -HEADERS = \ - camera.h \ - imagesettings.h \ - videosettings.h \ - metadatadialog.h - -SOURCES = \ - main.cpp \ - camera.cpp \ - imagesettings.cpp \ - videosettings.cpp \ - metadatadialog.cpp - -FORMS += \ - camera.ui \ - videosettings.ui \ - imagesettings.ui - -RESOURCES += camera.qrc - -target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/camera -INSTALLS += target - -QT+=widgets -include(../../multimedia/shared/shared.pri) diff --git a/examples/multimediawidgets/multimediawidgets.pro b/examples/multimediawidgets/multimediawidgets.pro deleted file mode 100644 index 001a78d50..000000000 --- a/examples/multimediawidgets/multimediawidgets.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = subdirs - -# These examples all need widgets for now (using creator templates that use widgets) -qtHaveModule(widgets) { - SUBDIRS += \ - camera \ - videographicsitem \ - videowidget \ - player \ - customvideosurface -} diff --git a/examples/multimediawidgets/player/player.pro b/examples/multimediawidgets/player/player.pro deleted file mode 100644 index bf63c70f3..000000000 --- a/examples/multimediawidgets/player/player.pro +++ /dev/null @@ -1,23 +0,0 @@ -TEMPLATE = app -TARGET = player - -QT += network \ - multimedia \ - multimediawidgets \ - widgets - -HEADERS = \ - player.h \ - playercontrols.h \ - playlistmodel.h \ - videowidget.h \ - histogramwidget.h -SOURCES = main.cpp \ - player.cpp \ - playercontrols.cpp \ - playlistmodel.cpp \ - videowidget.cpp \ - histogramwidget.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/player -INSTALLS += target diff --git a/examples/multimediawidgets/videographicsitem/videographicsitem.pro b/examples/multimediawidgets/videographicsitem/videographicsitem.pro deleted file mode 100644 index 30a9b6f21..000000000 --- a/examples/multimediawidgets/videographicsitem/videographicsitem.pro +++ /dev/null @@ -1,14 +0,0 @@ -TEMPLATE = app -TARGET = videographicsitem - -QT += multimedia multimediawidgets - -HEADERS += videoplayer.h - -SOURCES += main.cpp \ - videoplayer.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/videographicsitem -INSTALLS += target - -QT+=widgets diff --git a/examples/multimediawidgets/videowidget/videowidget.pro b/examples/multimediawidgets/videowidget/videowidget.pro deleted file mode 100644 index 603996b2e..000000000 --- a/examples/multimediawidgets/videowidget/videowidget.pro +++ /dev/null @@ -1,16 +0,0 @@ -TEMPLATE = app -TARGET = videowidget - -QT += multimedia multimediawidgets - -HEADERS = \ - videoplayer.h - -SOURCES = \ - main.cpp \ - videoplayer.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/videowidget -INSTALLS += target - -QT+=widgets diff --git a/qtmultimedia.pro b/qtmultimedia.pro deleted file mode 100644 index 29e5102f7..000000000 --- a/qtmultimedia.pro +++ /dev/null @@ -1,4 +0,0 @@ -requires(qtHaveModule(gui)) -requires(qtHaveModule(network)) -load(qt_parts) - diff --git a/src/android/android.pro b/src/android/android.pro deleted file mode 100644 index df5846945..000000000 --- a/src/android/android.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = jar diff --git a/src/android/jar/jar.pro b/src/android/jar/jar.pro deleted file mode 100644 index 0ef830f32..000000000 --- a/src/android/jar/jar.pro +++ /dev/null @@ -1,21 +0,0 @@ -TARGET = Qt$${QT_MAJOR_VERSION}AndroidMultimedia - -load(qt_build_paths) -CONFIG += java -DESTDIR = $$MODULE_BASE_OUTDIR/jar - -JAVACLASSPATH += $$PWD/src - -JAVASOURCES += $$PWD/src/org/qtproject/qt/android/multimedia/QtAndroidMediaPlayer.java \ - $$PWD/src/org/qtproject/qt/android/multimedia/QtCameraListener.java \ - $$PWD/src/org/qtproject/qt/android/multimedia/QtSurfaceTextureListener.java \ - $$PWD/src/org/qtproject/qt/android/multimedia/QtSurfaceTextureHolder.java \ - $$PWD/src/org/qtproject/qt/android/multimedia/QtMultimediaUtils.java \ - $$PWD/src/org/qtproject/qt/android/multimedia/QtMediaRecorderListener.java \ - $$PWD/src/org/qtproject/qt/android/multimedia/QtSurfaceHolderCallback.java - -# install -target.path = $$[QT_INSTALL_PREFIX]/jar -INSTALLS += target - -OTHER_FILES += $$JAVASOURCES diff --git a/src/imports/imports.pro b/src/imports/imports.pro deleted file mode 100644 index 4d081d9d7..000000000 --- a/src/imports/imports.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = subdirs -QT_FOR_CONFIG += multimedia-private - -SUBDIRS += multimedia diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro deleted file mode 100644 index 990ae40f1..000000000 --- a/src/imports/multimedia/multimedia.pro +++ /dev/null @@ -1,41 +0,0 @@ -CXX_MODULE = multimedia -TARGET = declarative_multimedia -TARGETPATH = QtMultimedia -QML_IMPORT_VERSION = 5.$$QT_MINOR_VERSION - -QT += qml quick network multimedia-private qtmultimediaquicktools-private - -HEADERS += \ - qdeclarativeaudio_p.h \ - qdeclarativemediametadata_p.h \ - qdeclarativeplaylist_p.h \ - qdeclarativecamera_p.h \ - qdeclarativecameracapture_p.h \ - qdeclarativecamerarecorder_p.h \ - qdeclarativecameraexposure_p.h \ - qdeclarativecameraflash_p.h \ - qdeclarativecamerafocus_p.h \ - qdeclarativecameraimageprocessing_p.h \ - qdeclarativecamerapreviewprovider_p.h \ - qdeclarativetorch_p.h \ - qdeclarativemultimediaglobal_p.h - -SOURCES += \ - multimedia.cpp \ - qdeclarativeaudio.cpp \ - qdeclarativeplaylist.cpp \ - qdeclarativecamera.cpp \ - qdeclarativecameracapture.cpp \ - qdeclarativecamerarecorder.cpp \ - qdeclarativecameraexposure.cpp \ - qdeclarativecameraflash.cpp \ - qdeclarativecamerafocus.cpp \ - qdeclarativecameraimageprocessing.cpp \ - qdeclarativecamerapreviewprovider.cpp \ - qdeclarativetorch.cpp \ - qdeclarativemultimediaglobal.cpp - -QML_FILES += \ - Video.qml - -load(qml_plugin) diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/audio/audio.pri deleted file mode 100644 index 754504420..000000000 --- a/src/multimedia/audio/audio.pri +++ /dev/null @@ -1,33 +0,0 @@ -INCLUDEPATH += audio - -PUBLIC_HEADERS += \ - audio/qaudio.h \ - audio/qaudiobuffer.h \ - audio/qaudioformat.h \ - audio/qaudioinput.h \ - audio/qaudiooutput.h \ - audio/qaudiodeviceinfo.h \ - audio/qsoundeffect.h \ - audio/qaudiodecoder.h - -PRIVATE_HEADERS += \ - audio/qaudiobuffer_p.h \ - audio/qaudiodeviceinfo_p.h \ - audio/qwavedecoder.h \ - audio/qsamplecache_p.h \ - audio/qaudiohelpers_p.h \ - audio/qaudiosystem_p.h \ - -SOURCES += \ - audio/qaudio.cpp \ - audio/qaudioformat.cpp \ - audio/qaudiodeviceinfo.cpp \ - audio/qaudiooutput.cpp \ - audio/qaudioinput.cpp \ - audio/qaudiosystem.cpp \ - audio/qsoundeffect.cpp \ - audio/qwavedecoder.cpp \ - audio/qsamplecache_p.cpp \ - audio/qaudiobuffer.cpp \ - audio/qaudiodecoder.cpp \ - audio/qaudiohelpers.cpp diff --git a/src/multimedia/camera/camera.pri b/src/multimedia/camera/camera.pri deleted file mode 100644 index f88b08df7..000000000 --- a/src/multimedia/camera/camera.pri +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDEPATH += camera - -PRIVATE_HEADERS += \ - camera/qcamera_p.h \ - camera/qcamerainfo_p.h \ - -PUBLIC_HEADERS += \ - camera/qcamera.h \ - camera/qcameraimagecapture.h \ - camera/qcameraexposure.h \ - camera/qcamerafocus.h \ - camera/qcameraimageprocessing.h \ - camera/qcamerainfo.h \ - -SOURCES += \ - camera/qcamera.cpp \ - camera/qcameraexposure.cpp \ - camera/qcamerafocus.cpp \ - camera/qcameraimageprocessing.cpp \ - camera/qcameraimagecapture.cpp \ - camera/qcamerainfo.cpp \ diff --git a/src/multimedia/doc/snippets/doc_src_qtmultimedia.pro b/src/multimedia/doc/snippets/doc_src_qtmultimedia.pro deleted file mode 100644 index 13da13011..000000000 --- a/src/multimedia/doc/snippets/doc_src_qtmultimedia.pro +++ /dev/null @@ -1,3 +0,0 @@ -#! [0] -QT += multimedia -#! [0] diff --git a/src/multimedia/doc/snippets/multimedia-snippets/multimedia-snippets.pro b/src/multimedia/doc/snippets/multimedia-snippets/multimedia-snippets.pro deleted file mode 100644 index a46b20bd0..000000000 --- a/src/multimedia/doc/snippets/multimedia-snippets/multimedia-snippets.pro +++ /dev/null @@ -1,26 +0,0 @@ -# Doc snippets - compiled for truthiness - -TEMPLATE = lib -TARGET = qtmmksnippets - -INCLUDEPATH += ../../../../src/global \ - ../../../../src/multimedia \ - ../../../../src/multimedia/audio \ - ../../../../src/multimedia/video \ - ../../../../src/multimedia/camera - -CONFIG += console - -QT += multimedia multimediawidgets widgets multimedia-private - -SOURCES += \ - audio.cpp \ - video.cpp \ - camera.cpp \ - media.cpp \ - qsound.cpp - -OTHER_FILES += \ - soundeffect.qml \ - qtvideosink.qml \ - multiple-videooutputs.qml diff --git a/src/multimedia/doc/snippets/snippets.pro b/src/multimedia/doc/snippets/snippets.pro deleted file mode 100644 index 31a3a0992..000000000 --- a/src/multimedia/doc/snippets/snippets.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += multimedia-snippets diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro deleted file mode 100644 index ec03ae8e5..000000000 --- a/src/multimedia/multimedia.pro +++ /dev/null @@ -1,70 +0,0 @@ -TARGET = QtMultimedia -QT = core-private network gui-private - -MODULE_PLUGIN_TYPES = \ - video/gstvideorenderer \ - video/videonode \ - -QMAKE_DOCS = $$PWD/doc/qtmultimedia.qdocconf - -INCLUDEPATH *= . - -PRIVATE_HEADERS += \ - qtmultimediaglobal_p.h \ - qmediapluginloader_p.h \ - qmediastoragelocation_p.h \ - qmultimediautils_p.h \ - -PUBLIC_HEADERS += \ - qtmultimediaglobal.h \ - qmediadevicemanager.h \ - qmediaenumdebug.h \ - qmediametadata.h \ - qmediatimerange.h \ - qmultimedia.h \ - qmediaformat.h - -SOURCES += \ - qmediadevicemanager.cpp \ - qmediametadata.cpp \ - qmediapluginloader.cpp \ - qmediatimerange.cpp \ - qmediastoragelocation.cpp \ - qmultimedia.cpp \ - qmultimediautils.cpp \ - qmediaformat.cpp - -CONFIG += simd optimize_full - -include(audio/audio.pri) -include(camera/camera.pri) -include(controls/controls.pri) -include(playback/playback.pri) -include(recording/recording.pri) -include(video/video.pri) -include(platform/platform.pri) - -ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/Qt$${QT_MAJOR_VERSION}AndroidMultimedia.jar:org.qtproject.qt.android.multimedia.QtMultimediaUtils -ANDROID_LIB_DEPENDENCIES = \ - plugins/mediaservice/libplugins_mediaservice_qtmedia_android.so \ - lib/libQt6MultimediaQuick.so:Qt6Quick -ANDROID_BUNDLED_FILES += \ - lib/libQt6MultimediaQuick.so -ANDROID_PERMISSIONS += \ - android.permission.CAMERA \ - android.permission.RECORD_AUDIO -ANDROID_FEATURES += \ - android.hardware.camera \ - android.hardware.camera.autofocus \ - android.hardware.microphone - -MODULE_WINRT_CAPABILITIES_DEVICE += \ - microphone \ - webcam - -win32: LIBS_PRIVATE += -luuid - -HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS - -load(qt_module) diff --git a/src/multimedia/platform/alsa/alsa.pri b/src/multimedia/platform/alsa/alsa.pri deleted file mode 100644 index 836f52314..000000000 --- a/src/multimedia/platform/alsa/alsa.pri +++ /dev/null @@ -1,13 +0,0 @@ -QMAKE_USE_PRIVATE += alsa - -HEADERS += $$PWD/qalsaaudiodeviceinfo_p.h \ - $$PWD/qalsaaudioinput_p.h \ - $$PWD/qalsaaudiooutput_p.h \ - $$PWD/qalsadevicemanager_p.h \ - $$PWD/qalsaintegration_p.h - -SOURCES += $$PWD/qalsaaudiodeviceinfo.cpp \ - $$PWD/qalsaaudioinput.cpp \ - $$PWD/qalsaaudiooutput.cpp \ - $$PWD/qalsadevicemanager.cpp \ - $$PWD/qalsaintegration.cpp diff --git a/src/multimedia/platform/android/android.pri b/src/multimedia/platform/android/android.pri deleted file mode 100644 index 4369a1864..000000000 --- a/src/multimedia/platform/android/android.pri +++ /dev/null @@ -1,17 +0,0 @@ -QT += opengl core-private network - -HEADERS += \ - $$PWD/qandroidintegration_p.h \ - $$PWD/qandroiddevicemanager_p.h \ - $$PWD/qandroidformatsinfo_p.h - -SOURCES += \ - $$PWD/qandroidintegration.cpp \ - $$PWD/qandroiddevicemanager.cpp \ - $$PWD/qandroidformatsinfo.cpp - -include(audio/audio.pri) -include(wrappers/jni/jni.pri) -include(common/common.pri) -include(mediaplayer/mediaplayer.pri) -include(mediacapture/mediacapture.pri) diff --git a/src/multimedia/platform/android/audio/audio.pri b/src/multimedia/platform/android/audio/audio.pri deleted file mode 100644 index 7d3792f6c..000000000 --- a/src/multimedia/platform/android/audio/audio.pri +++ /dev/null @@ -1,13 +0,0 @@ -LIBS += -lOpenSLES - -HEADERS += \ - $$PWD/qopenslesengine_p.h \ - $$PWD/qopenslesdeviceinfo_p.h \ - $$PWD/qopenslesaudioinput_p.h \ - $$PWD/qopenslesaudiooutput_p.h - -SOURCES += \ - $$PWD/qopenslesengine.cpp \ - $$PWD/qopenslesdeviceinfo.cpp \ - $$PWD/qopenslesaudioinput.cpp \ - $$PWD/qopenslesaudiooutput.cpp diff --git a/src/multimedia/platform/android/common/common.pri b/src/multimedia/platform/android/common/common.pri deleted file mode 100644 index 67a5116d2..000000000 --- a/src/multimedia/platform/android/common/common.pri +++ /dev/null @@ -1,10 +0,0 @@ -INCLUDEPATH += $$PWD - -HEADERS += \ - $$PWD/qandroidglobal_p.h \ - $$PWD/qandroidvideooutput_p.h \ - $$PWD/qandroidmultimediautils_p.h - -SOURCES += \ - $$PWD/qandroidvideooutput.cpp \ - $$PWD/qandroidmultimediautils.cpp diff --git a/src/multimedia/platform/android/mediacapture/mediacapture.pri b/src/multimedia/platform/android/mediacapture/mediacapture.pri deleted file mode 100644 index 97083c284..000000000 --- a/src/multimedia/platform/android/mediacapture/mediacapture.pri +++ /dev/null @@ -1,25 +0,0 @@ -INCLUDEPATH += $$PWD - -SOURCES += \ - $$PWD/qandroidcaptureservice.cpp \ - $$PWD/qandroidcameracontrol.cpp \ - $$PWD/qandroidcamerasession.cpp \ - $$PWD/qandroidcameraexposurecontrol.cpp \ - $$PWD/qandroidcameraimageprocessingcontrol.cpp \ - $$PWD/qandroidcameraimagecapturecontrol.cpp \ - $$PWD/qandroidcamerafocuscontrol.cpp \ - $$PWD/qandroidcapturesession.cpp \ - $$PWD/qandroidmediarecordercontrol.cpp \ - $$PWD/qandroidcameravideorenderercontrol.cpp - -HEADERS += \ - $$PWD/qandroidcaptureservice_p.h \ - $$PWD/qandroidcameracontrol_p.h \ - $$PWD/qandroidcamerasession_p.h \ - $$PWD/qandroidcameraexposurecontrol_p.h \ - $$PWD/qandroidcameraimageprocessingcontrol_p.h \ - $$PWD/qandroidcameraimagecapturecontrol_p.h \ - $$PWD/qandroidcamerafocuscontrol_p.h \ - $$PWD/qandroidcapturesession_p.h \ - $$PWD/qandroidmediarecordercontrol_p.h \ - $$PWD/qandroidcameravideorenderercontrol_p.h diff --git a/src/multimedia/platform/android/mediaplayer/mediaplayer.pri b/src/multimedia/platform/android/mediaplayer/mediaplayer.pri deleted file mode 100644 index 8478398bb..000000000 --- a/src/multimedia/platform/android/mediaplayer/mediaplayer.pri +++ /dev/null @@ -1,11 +0,0 @@ -INCLUDEPATH += $$PWD - -HEADERS += \ - $$PWD/qandroidmediaplayercontrol_p.h \ - $$PWD/qandroidmetadata_p.h \ - $$PWD/qandroidmediaplayervideorenderercontrol_p.h - -SOURCES += \ - $$PWD/qandroidmediaplayercontrol.cpp \ - $$PWD/qandroidmetadata.cpp \ - $$PWD/qandroidmediaplayervideorenderercontrol.cpp diff --git a/src/multimedia/platform/android/wrappers/jni/jni.pri b/src/multimedia/platform/android/wrappers/jni/jni.pri deleted file mode 100644 index 14bc78573..000000000 --- a/src/multimedia/platform/android/wrappers/jni/jni.pri +++ /dev/null @@ -1,21 +0,0 @@ -QT += core-private - -INCLUDEPATH += $$PWD - -HEADERS += \ - $$PWD/androidmediaplayer_p.h \ - $$PWD/androidsurfacetexture_p.h \ - $$PWD/androidmediametadataretriever_p.h \ - $$PWD/androidcamera_p.h \ - $$PWD/androidmultimediautils_p.h \ - $$PWD/androidmediarecorder_p.h \ - $$PWD/androidsurfaceview_p.h - -SOURCES += \ - $$PWD/androidmediaplayer.cpp \ - $$PWD/androidsurfacetexture.cpp \ - $$PWD/androidmediametadataretriever.cpp \ - $$PWD/androidcamera.cpp \ - $$PWD/androidmultimediautils.cpp \ - $$PWD/androidmediarecorder.cpp \ - $$PWD/androidsurfaceview.cpp diff --git a/src/multimedia/platform/darwin/audio/audio.pri b/src/multimedia/platform/darwin/audio/audio.pri deleted file mode 100644 index f9ec3d68d..000000000 --- a/src/multimedia/platform/darwin/audio/audio.pri +++ /dev/null @@ -1,25 +0,0 @@ -HEADERS += \ - $$PWD/qcoreaudiodeviceinfo_p.h \ - $$PWD/qcoreaudioinput_p.h \ - $$PWD/qcoreaudiooutput_p.h \ - $$PWD/qcoreaudioutils_p.h - -SOURCES += \ - $$PWD/qcoreaudiodeviceinfo.mm \ - $$PWD/qcoreaudioinput.mm \ - $$PWD/qcoreaudiooutput.mm \ - $$PWD/qcoreaudioutils.mm - -ios|tvos { - HEADERS += $$PWD/qcoreaudiosessionmanager_p.h - SOURCES += $$PWD/qcoreaudiosessionmanager.mm - LIBS += -framework Foundation -framework AVFoundation -} else { - LIBS += \ - -framework ApplicationServices \ - -framework AudioUnit -} - -LIBS += \ - -framework CoreAudio \ - -framework AudioToolbox diff --git a/src/multimedia/platform/darwin/camera/camera.pri b/src/multimedia/platform/darwin/camera/camera.pri deleted file mode 100644 index 89ef8258d..000000000 --- a/src/multimedia/platform/darwin/camera/camera.pri +++ /dev/null @@ -1,34 +0,0 @@ -HEADERS += \ - $$PWD/avfcameradebug_p.h \ - $$PWD/avfcamera_p.h \ - $$PWD/avfcameraimagecapture_p.h \ - $$PWD/avfcameraservice_p.h \ - $$PWD/avfcamerasession_p.h \ - $$PWD/avfstoragelocation_p.h \ - $$PWD/avfcamerarenderer_p.h \ - $$PWD/avfcamerafocus_p.h \ - $$PWD/avfcameraexposure_p.h \ - $$PWD/avfcameraimageprocessing_p.h \ - $$PWD/avfcamerautility_p.h \ - $$PWD/avfimageencodercontrol_p.h \ - $$PWD/avfcamerawindowcontrol_p.h \ - $$PWD/avfmediaencoder_p.h \ - $$PWD/avfmediaassetwriter_p.h - - -SOURCES += \ - $$PWD/avfcamera.mm \ - $$PWD/avfcameraimagecapture.mm \ - $$PWD/avfcameraservice.mm \ - $$PWD/avfcamerasession.mm \ - $$PWD/avfstoragelocation.mm \ - $$PWD/avfcamerarenderer.mm \ - $$PWD/avfcamerafocus.mm \ - $$PWD/avfcameraexposure.mm \ - $$PWD/avfcameraimageprocessing.mm \ - $$PWD/avfcamerautility.mm \ - $$PWD/avfimageencodercontrol.mm \ - $$PWD/avfcamerawindowcontrol.mm \ - $$PWD/avfmediaencoder.mm \ - $$PWD/avfmediaassetwriter.mm - diff --git a/src/multimedia/platform/darwin/darwin.pri b/src/multimedia/platform/darwin/darwin.pri deleted file mode 100644 index 935a8451b..000000000 --- a/src/multimedia/platform/darwin/darwin.pri +++ /dev/null @@ -1,30 +0,0 @@ -LIBS += -framework CoreFoundation \ - -framework Foundation \ - -framework AudioToolbox \ - -framework CoreAudio \ - -framework QuartzCore \ - -framework CoreMedia \ - -framework CoreVideo \ - -framework QuartzCore \ - -framework Metal -osx:LIBS += -framework AppKit \ - -framework AudioUnit -ios:LIBS += -framework CoreGraphics \ - -framework CoreVideo - -QMAKE_USE += avfoundation - -include(audio/audio.pri) -include(mediaplayer/mediaplayer.pri) -!tvos:include(camera/camera.pri) - - -SOURCES += \ - $$PWD/qdarwinintegration.cpp \ - $$PWD/qdarwindevicemanager.mm \ - $$PWD/qdarwinformatsinfo.mm - -HEADERS += \ - $$PWD/qdarwinintegration_p.h \ - $$PWD/qdarwindevicemanager_p.h \ - $$PWD/qdarwinformatsinfo_p.h diff --git a/src/multimedia/platform/darwin/mediaplayer/mediaplayer.pri b/src/multimedia/platform/darwin/mediaplayer/mediaplayer.pri deleted file mode 100644 index e0c5ae349..000000000 --- a/src/multimedia/platform/darwin/mediaplayer/mediaplayer.pri +++ /dev/null @@ -1,42 +0,0 @@ -QT += opengl network - -HEADERS += \ - $$PWD/avfmediaplayer_p.h \ - $$PWD/avfmetadata_p.h \ - $$PWD/avfvideooutput_p.h \ - $$PWD/avfvideowindowcontrol_p.h - -SOURCES += \ - $$PWD/avfmediaplayer.mm \ - $$PWD/avfmetadata.mm \ - $$PWD/avfvideooutput.mm \ - $$PWD/avfvideowindowcontrol.mm - -ios|tvos { - qtConfig(opengl) { - HEADERS += \ - $$PWD/avfvideoframerenderer_ios_p.h \ - $$PWD/avfvideorenderercontrol_p.h \ - $$PWD/avfdisplaylink_p.h - - SOURCES += \ - $$PWD/avfvideoframerenderer_ios.mm \ - $$PWD/avfvideorenderercontrol.mm \ - $$PWD/avfdisplaylink.mm - } - LIBS += -framework Foundation -} else { - LIBS += -framework AppKit - - qtConfig(opengl) { - HEADERS += \ - $$PWD/avfvideoframerenderer_p.h \ - $$PWD/avfvideorenderercontrol_p.h \ - $$PWD/avfdisplaylink_p.h - - SOURCES += \ - $$PWD/avfvideoframerenderer.mm \ - $$PWD/avfvideorenderercontrol.mm \ - $$PWD/avfdisplaylink.mm - } -} diff --git a/src/multimedia/platform/gstreamer/audio/audio.pri b/src/multimedia/platform/gstreamer/audio/audio.pri deleted file mode 100644 index 862dd35b6..000000000 --- a/src/multimedia/platform/gstreamer/audio/audio.pri +++ /dev/null @@ -1,11 +0,0 @@ -HEADERS += \ - $$PWD/qaudiodeviceinfo_gstreamer_p.h \ - $$PWD/qaudiooutput_gstreamer_p.h \ - $$PWD/qaudioinput_gstreamer_p.h \ - $$PWD/qgstreameraudiodecodercontrol_p.h - -SOURCES += \ - $$PWD/qaudiodeviceinfo_gstreamer.cpp \ - $$PWD/qaudiooutput_gstreamer.cpp \ - $$PWD/qaudioinput_gstreamer.cpp \ - $$PWD/qgstreameraudiodecodercontrol.cpp diff --git a/src/multimedia/platform/gstreamer/common/common.pri b/src/multimedia/platform/gstreamer/common/common.pri deleted file mode 100644 index cb222697e..000000000 --- a/src/multimedia/platform/gstreamer/common/common.pri +++ /dev/null @@ -1,32 +0,0 @@ -HEADERS += \ - $$PWD/qgst_p.h \ - $$PWD/qgstappsrc_p.h \ - $$PWD/qgstreamerbushelper_p.h \ - $$PWD/qgstreamermessage_p.h \ - $$PWD/qgstreamermetadata_p.h \ - $$PWD/qgstutils_p.h \ - $$PWD/qgstvideobuffer_p.h \ - $$PWD/qgstreamerbufferprobe_p.h \ - $$PWD/qgstreamervideorenderer_p.h \ - $$PWD/qgstreamervideowindow_p.h \ - $$PWD/qgstreamervideooverlay_p.h \ - $$PWD/qgstreamerplayersession_p.h \ - $$PWD/qgstreamerplayercontrol_p.h \ - $$PWD/qgstvideorendererplugin_p.h \ - $$PWD/qgstvideorenderersink_p.h \ - -SOURCES += \ - $$PWD/qgstappsrc.cpp \ - $$PWD/qgstreamerbushelper.cpp \ - $$PWD/qgstreamermessage.cpp \ - $$PWD/qgstreamermetadata.cpp \ - $$PWD/qgstutils.cpp \ - $$PWD/qgstvideobuffer.cpp \ - $$PWD/qgstreamerbufferprobe.cpp \ - $$PWD/qgstreamervideorenderer.cpp \ - $$PWD/qgstreamervideowindow.cpp \ - $$PWD/qgstreamervideooverlay.cpp \ - $$PWD/qgstreamerplayersession.cpp \ - $$PWD/qgstreamerplayercontrol.cpp \ - $$PWD/qgstvideorendererplugin.cpp \ - $$PWD/qgstvideorenderersink.cpp \ diff --git a/src/multimedia/platform/gstreamer/gstreamer.pri b/src/multimedia/platform/gstreamer/gstreamer.pri deleted file mode 100644 index 6261f711b..000000000 --- a/src/multimedia/platform/gstreamer/gstreamer.pri +++ /dev/null @@ -1,34 +0,0 @@ -DEFINES += GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 - -QMAKE_USE_PRIVATE += gstreamer gstreamer_app - -SOURCES += \ - $$PWD/qgstreamerintegration.cpp \ - $$PWD/qgstreamerdevicemanager.cpp \ - $$PWD/qgstreamerformatsinfo.cpp - -HEADERS += \ - $$PWD/qgstreamerintegration_p.h \ - $$PWD/qgstreamerdevicemanager_p.h \ - $$PWD/qgstreamerformatsinfo_p.h - -include(audio/audio.pri) -include(common/common.pri) -use_camerabin { - include(camerabin/camerabin.pri) - DEFINES += GST_USE_CAMERABIN -} else { - include(mediacapture/mediacapture.pri) -} - -qtConfig(gstreamer_gl): QMAKE_USE += gstreamer_gl - -android { - LIBS_PRIVATE += \ - -L$$(GSTREAMER_ROOT_ANDROID)/armv7/lib \ - -Wl,--_p.hole-archive \ - -lgstapp-1.0 -lgstreamer-1.0 -lgstaudio-1.0 -lgsttag-1.0 -lgstvideo-1.0 -lgstbase-1.0 -lgstpbutils-1.0 \ - -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lffi -lintl -liconv -lorc-0.4 \ - -Wl,--no-_p.hole-archive -} - diff --git a/src/multimedia/platform/gstreamer/mediacapture/mediacapture.pri b/src/multimedia/platform/gstreamer/mediacapture/mediacapture.pri deleted file mode 100644 index 81d77cf6c..000000000 --- a/src/multimedia/platform/gstreamer/mediacapture/mediacapture.pri +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDEPATH += $$PWD - -HEADERS += $$PWD/qgstreamercaptureservice_p.h \ - $$PWD/qgstreamercapturesession_p.h \ - $$PWD/qgstreamerrecordercontrol_p.h \ - $$PWD/qgstreamercameracontrol_p.h \ - $$PWD/qgstreamerimagecapturecontrol_p.h \ - -SOURCES += $$PWD/qgstreamercaptureservice.cpp \ - $$PWD/qgstreamercapturesession.cpp \ - $$PWD/qgstreamerrecordercontrol.cpp \ - $$PWD/qgstreamercameracontrol.cpp \ - $$PWD/qgstreamerimagecapturecontrol.cpp \ - -# Camera usage with gstreamer needs to have -CONFIG += use_gstreamer_camera - diff --git a/src/multimedia/platform/platform.pri b/src/multimedia/platform/platform.pri deleted file mode 100644 index 1e99109f5..000000000 --- a/src/multimedia/platform/platform.pri +++ /dev/null @@ -1,34 +0,0 @@ -HEADERS += \ - $$PWD/qplatformmediacapture_p.h \ - $$PWD/qplatformmediaintegration_p.h \ - $$PWD/qplatformmediadevicemanager_p.h \ - $$PWD/qplatformmediaformatinfo_p.h \ - $$PWD/qplatformaudiodecoder_p.h \ - $$PWD/platformcamera.h \ - $$PWD/qplatformcameraexposure_p.h \ - $$PWD/platform/qplatformcamerafocus_p.h \ - $$PWD/qplatformcameraimagecapture_p.h \ - $$PWD/qplatformcameraimageprocessing_p.h \ - $$PWD/qplatformmediarecorder_p.h \ - -SOURCES += \ - $$PWD/qplatformmediacapture.cpp \ - $$PWD/qplatformmediaintegration.cpp \ - $$PWD/qplatformmediadevicemanager.cpp \ - $$PWD/qplatformmediaformatinfo.cpp \ - $$PWD/qplatformaudiodecoder.cpp \ - $$PWD/platformcamera.cpp \ - $$PWD/qplatformcameraexposure.cpp \ - $$PWD/platform/qplatformcamerafocus.cpp \ - $$PWD/qplatformcameraimagecapture.cpp \ - $$PWD/qplatformcameraimageprocessing.cpp \ - $$PWD/qplatformmediarecorder.cpp \ - -qtConfig(gstreamer):include(gstreamer/gstreamer.pri) -qtConfig(pulseaudio): include(pulseaudio/pulseaudio.pri) -qtConfig(alsa): include(alsa/alsa.pri) -android:include(android/android.pri) -win32:include(windows/windows.pri) -darwin:!watchos:include(darwin/darwin.pri) -qnx: include(qnx/qnx.pri) - diff --git a/src/multimedia/platform/pulseaudio/pulseaudio.pri b/src/multimedia/platform/pulseaudio/pulseaudio.pri deleted file mode 100644 index 6eae9eaaa..000000000 --- a/src/multimedia/platform/pulseaudio/pulseaudio.pri +++ /dev/null @@ -1,20 +0,0 @@ -QMAKE_USE_PRIVATE += pulseaudio - -HEADERS += \ - $$PWD/qaudiodeviceinfo_pulse_p.h \ - $$PWD/qaudiooutput_pulse_p.h \ - $$PWD/qaudioinput_pulse_p.h \ - $$PWD/qaudioengine_pulse_p.h \ - $$PWD/qpulsehelpers_p.h \ - $$PWD/qpulseaudiodevicemanager_p.h \ - $$PWD/qpulseaudiointegration_p.h - -SOURCES += \ - $$PWD/qaudiodeviceinfo_pulse.cpp \ - $$PWD/qaudiooutput_pulse.cpp \ - $$PWD/qaudioinput_pulse.cpp \ - $$PWD/qaudioengine_pulse.cpp \ - $$PWD/qpulsehelpers.cpp \ - $$PWD/qpulseaudiodevicemanager.cpp \ - $$PWD/qpulseaudiointegration.cpp - diff --git a/src/multimedia/platform/qnx/audio/audio.pri b/src/multimedia/platform/qnx/audio/audio.pri deleted file mode 100644 index c9a345722..000000000 --- a/src/multimedia/platform/qnx/audio/audio.pri +++ /dev/null @@ -1,13 +0,0 @@ -LIBS += -lasound - -HEADERS += \ - $$PWD/qnxaudiodeviceinfo_p.h \ - $$PWD/qnxaudioinput_p.h \ - $$PWD/qnxaudiooutput_p.h \ - $$PWD/qnxaudioutils_p.h \ - -SOURCES += \ - $$PWD/qnxaudiodeviceinfo.cpp \ - $$PWD/qnxaudioinput.cpp \ - $$PWD/qnxaudiooutput.cpp \ - $$PWD/qnxaudioutils.cpp \ diff --git a/src/multimedia/platform/qnx/camera/camera.pri b/src/multimedia/platform/qnx/camera/camera.pri deleted file mode 100644 index 49dc5b778..000000000 --- a/src/multimedia/platform/qnx/camera/camera.pri +++ /dev/null @@ -1,36 +0,0 @@ -INCLUDEPATH += $$PWD - -HEADERS += \ - $$PWD/bbcameraaudioencodersettingscontrol_p.h \ - $$PWD/bbcameracontrol_p.h \ - $$PWD/bbcameraexposurecontrol_p.h \ - $$PWD/bbcamerafocuscontrol_p.h \ - $$PWD/bbcameraimagecapturecontrol_p.h \ - $$PWD/bbcameraimageprocessingcontrol_p.h \ - $$PWD/bbcameramediarecordercontrol_p.h \ - $$PWD/bbcameraorientatio_p.handler.h \ - $$PWD/bbcameraservice_p.h \ - $$PWD/bbcamerasession_p.h \ - $$PWD/bbcameravideoencodersettingscontrol_p.h \ - $$PWD/bbimageencodercontrol_p.h \ - $$PWD/bbmediastoragelocation_p.h \ - $$PWD/bbvideorenderercontrol_p.h - -SOURCES += \ - $$PWD/bbcameraaudioencodersettingscontrol.cpp \ - $$PWD/bbcameracontrol.cpp \ - $$PWD/bbcameraexposurecontrol.cpp \ - $$PWD/bbcamerafocuscontrol.cpp \ - $$PWD/bbcameraimagecapturecontrol.cpp \ - $$PWD/bbcameraimageprocessingcontrol.cpp \ - $$PWD/bbcameramediarecordercontrol.cpp \ - $$PWD/bbcameraorientatio_p.handler.cpp \ - $$PWD/bbcameraservice.cpp \ - $$PWD/bbcamerasession.cpp \ - $$PWD/bbcameravideoencodersettingscontrol.cpp \ - $$PWD/bbimageencodercontrol.cpp \ - $$PWD/bbmediastoragelocation.cpp \ - $$PWD/bbvideorenderercontrol.cpp - -LIBS += -lcamapi -laudio_manager - diff --git a/src/multimedia/platform/qnx/common/common.pri b/src/multimedia/platform/qnx/common/common.pri deleted file mode 100644 index dc37a291d..000000000 --- a/src/multimedia/platform/qnx/common/common.pri +++ /dev/null @@ -1,7 +0,0 @@ -INCLUDEPATH += $$PWD - -HEADERS += \ - $$PWD/windowgrabber_p.h - -SOURCES += \ - $$PWD/windowgrabber.cpp diff --git a/src/multimedia/platform/qnx/mediaplayer/mediaplayer.pri b/src/multimedia/platform/qnx/mediaplayer/mediaplayer.pri deleted file mode 100644 index 5ab7516ab..000000000 --- a/src/multimedia/platform/qnx/mediaplayer/mediaplayer.pri +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDEPATH += $$PWD - -HEADERS += \ - $$PWD/mmrenderermediaplayercontrol_p.h \ - $$PWD/mmrenderermediaplayerservice_p.h \ - $$PWD/mmrenderermetadata_p.h \ - $$PWD/mmrendererplayervideorenderercontrol_p.h \ - $$PWD/mmrendererutil_p.h \ - $$PWD/mmrenderervideowindowcontrol_p.h \ - $$PWD/mmreventmediaplayercontrol_p.h \ - $$PWD/mmrevent_p.hread.h -SOURCES += \ - $$PWD/mmrenderermediaplayercontrol.cpp \ - $$PWD/mmrenderermediaplayerservice.cpp \ - $$PWD/mmrenderermetadata.cpp \ - $$PWD/mmrendererplayervideorenderercontrol.cpp \ - $$PWD/mmrendererutil.cpp \ - $$PWD/mmrenderervideowindowcontrol.cpp \ - $$PWD/mmreventmediaplayercontrol.cpp \ - $$PWD/mmrevent_p.hread.cpp - -QMAKE_USE += mmrenderer diff --git a/src/multimedia/platform/qnx/qnx.pri b/src/multimedia/platform/qnx/qnx.pri deleted file mode 100644 index 75c0b3403..000000000 --- a/src/multimedia/platform/qnx/qnx.pri +++ /dev/null @@ -1,12 +0,0 @@ -HEADERS += \ - $$PWD/qqnxdevicemanager_p.h \ - $$PWD/qqnxintegration_p.h - -SOURCES += \ - $$PWD/qqnxdevicemanager.cpp \ - $$PWD/qqnxintegration.cpp - -include(audio/audio.pri) -include(common/common.pri) -include(mediaplayer/mediaplayer.pri) -include(camera/camera.pri) diff --git a/src/multimedia/platform/windows/audio/audio.pri b/src/multimedia/platform/windows/audio/audio.pri deleted file mode 100644 index ed551287c..000000000 --- a/src/multimedia/platform/windows/audio/audio.pri +++ /dev/null @@ -1,15 +0,0 @@ - -LIBS += -lstrmiids -lole32 -loleaut32 -lwinmm - -HEADERS += \ - $$PWD/qwindowsaudiodeviceinfo_p.h \ - $$PWD/qwindowsaudioinput_p.h \ - $$PWD/qwindowsaudiooutput_p.h \ - $$PWD/qwindowsaudioutils_p.h - -SOURCES += \ - $$PWD/qwindowsaudiodeviceinfo.cpp \ - $$PWD/qwindowsaudioinput.cpp \ - $$PWD/qwindowsaudiooutput.cpp \ - $$PWD/qwindowsaudioutils.cpp - diff --git a/src/multimedia/platform/windows/decoder/decoder.pri b/src/multimedia/platform/windows/decoder/decoder.pri deleted file mode 100644 index 93cc683d4..000000000 --- a/src/multimedia/platform/windows/decoder/decoder.pri +++ /dev/null @@ -1,12 +0,0 @@ -INCLUDEPATH += $$PWD - -LIBS += -lmfreadwrite -lwmcodecdspuuid -QMAKE_USE += wmf - -HEADERS += \ - $$PWD/mfdecodersourcereader_p.h \ - $$PWD/mfaudiodecodercontrol_p.h - -SOURCES += \ - $$PWD/mfdecodersourcereader.cpp \ - $$PWD/mfaudiodecodercontrol.cpp diff --git a/src/multimedia/platform/windows/evr/evr.pri b/src/multimedia/platform/windows/evr/evr.pri deleted file mode 100644 index 6168063e9..000000000 --- a/src/multimedia/platform/windows/evr/evr.pri +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDEPATH += $$PWD - -qtHaveModule(widgets): QT += widgets -QT += gui-private - -LIBS += -lmf -lmfplat -lmfuuid -ld3d9 -ldxva2 -lwinmm -levr - -HEADERS += \ - $$PWD/evrvideowindowcontrol_p.h \ - $$PWD/evrcustompresenter_p.h \ - $$PWD/evrd3dpresentengine_p.h \ - $$PWD/evrhelpers_p.h \ - $$PWD/evrdefs_p.h - -SOURCES += \ - $$PWD/evrvideowindowcontrol.cpp \ - $$PWD/evrcustompresenter.cpp \ - $$PWD/evrd3dpresentengine.cpp \ - $$PWD/evrhelpers.cpp \ - $$PWD/evrdefs.cpp diff --git a/src/multimedia/platform/windows/player/player.pri b/src/multimedia/platform/windows/player/player.pri deleted file mode 100644 index 0f79f7433..000000000 --- a/src/multimedia/platform/windows/player/player.pri +++ /dev/null @@ -1,24 +0,0 @@ -INCLUDEPATH += $$PWD - -LIBS += -lgdi32 -luser32 -QMAKE_USE += wmf - -HEADERS += \ - $$PWD/mfplayersession_p.h \ - $$PWD/mfplayercontrol_p.h \ - $$PWD/mfvideorenderercontrol_p.h \ - $$PWD/mfmetadata_p.h \ - $$PWD/mfevrvideowindowcontrol_p.h \ - $$PWD/samplegrabber_p.h \ - $$PWD/mftvideo_p.h \ - $$PWD/mfactivate_p.h - -SOURCES += \ - $$PWD/mfplayersession.cpp \ - $$PWD/mfplayercontrol.cpp \ - $$PWD/mfvideorenderercontrol.cpp \ - $$PWD/mfmetadata.cpp \ - $$PWD/mfevrvideowindowcontrol.cpp \ - $$PWD/samplegrabber.cpp \ - $$PWD/mftvideo.cpp \ - $$PWD/mfactivate.cpp diff --git a/src/multimedia/platform/windows/windows.pri b/src/multimedia/platform/windows/windows.pri deleted file mode 100644 index 701267b64..000000000 --- a/src/multimedia/platform/windows/windows.pri +++ /dev/null @@ -1,24 +0,0 @@ -QT += network - -win32:!qtHaveModule(opengl) { - LIBS_PRIVATE += -lgdi32 -luser32 -} - -INCLUDEPATH += . - -HEADERS += \ - $$PWD/mfstream_p.h \ - $$PWD/sourceresolver_p.h \ - $$PWD/qwindowsdevicemanager_p.h \ - $$PWD/qwindowsintegration_p.h - -SOURCES += \ - $$PWD/mfstream.cpp \ - $$PWD/sourceresolver.cpp \ - $$PWD/qwindowsdevicemanager.cpp \ - $$PWD/qwindowsintegration.cpp - -include (audio/audio.pri) -include (evr/evr.pri) -include (player/player.pri) -include (decoder/decoder.pri) diff --git a/src/multimedia/playback/playback.pri b/src/multimedia/playback/playback.pri deleted file mode 100644 index ec6dfad2a..000000000 --- a/src/multimedia/playback/playback.pri +++ /dev/null @@ -1,14 +0,0 @@ -INCLUDEPATH += playback - -PUBLIC_HEADERS += \ - playback/qmediaplayer.h \ - playback/qmediaplaylist.h - -PRIVATE_HEADERS += \ - playback/qmediaplaylist_p.h \ - playback/qplaylistfileparser_p.h - -SOURCES += \ - playback/qmediaplayer.cpp \ - playback/qmediaplaylist.cpp \ - playback/qplaylistfileparser.cpp diff --git a/src/multimedia/recording/recording.pri b/src/multimedia/recording/recording.pri deleted file mode 100644 index 2bc1f3844..000000000 --- a/src/multimedia/recording/recording.pri +++ /dev/null @@ -1,12 +0,0 @@ -INCLUDEPATH += recording - -PUBLIC_HEADERS += \ - recording/qmediaencodersettings.h \ - recording/qmediarecorder.h \ - -PRIVATE_HEADERS += \ - recording/qmediarecorder_p.h \ - -SOURCES += \ - recording/qmediaencodersettings.cpp \ - recording/qmediarecorder.cpp diff --git a/src/multimedia/video/video.pri b/src/multimedia/video/video.pri deleted file mode 100644 index c6ba59c2b..000000000 --- a/src/multimedia/video/video.pri +++ /dev/null @@ -1,30 +0,0 @@ - -INCLUDEPATH += video - -PUBLIC_HEADERS += \ - video/qabstractvideosurface.h \ - video/qvideoframe.h \ - video/qvideoframeformat.h \ - -PRIVATE_HEADERS += \ - video/qabstractvideobuffer_p.h \ - video/qimagevideobuffer_p.h \ - video/qmemoryvideobuffer_p.h \ - video/qvideooutputorientationhandler_p.h \ - video/qvideoframeconversionhelper_p.h \ - video/qvideosurfaces_p.h - -SOURCES += \ - video/qabstractvideobuffer.cpp \ - video/qabstractvideosurface.cpp \ - video/qimagevideobuffer.cpp \ - video/qmemoryvideobuffer.cpp \ - video/qvideoframe.cpp \ - video/qvideooutputorientationhandler.cpp \ - video/qvideoframeformat.cpp \ - video/qvideoframeconversionhelper.cpp \ - video/qvideosurfaces.cpp - -SSE2_SOURCES += video/qvideoframeconversionhelper_sse2.cpp -SSSE3_SOURCES += video/qvideoframeconversionhelper_ssse3.cpp -AVX2_SOURCES += video/qvideoframeconversionhelper_avx2.cpp diff --git a/src/multimediaquick/qtmultimediaquicktools.pro b/src/multimediaquick/qtmultimediaquicktools.pro deleted file mode 100644 index 6df255a51..000000000 --- a/src/multimediaquick/qtmultimediaquicktools.pro +++ /dev/null @@ -1,32 +0,0 @@ -TARGET = QtMultimediaQuick - -QT = core quick multimedia-private quick-private -CONFIG += internal_module - -PRIVATE_HEADERS += \ - qdeclarativevideooutput_p.h \ - qsgvideonode_p.h \ - qsgvideotexture_p.h \ - qtmultimediaquickglobal_p.h - -HEADERS += \ - $$PRIVATE_HEADERS \ - -SOURCES += \ - qsgvideonode_p.cpp \ - qsgvideotexture.cpp \ - qdeclarativevideooutput.cpp \ - -SOURCES += qdeclarativevideooutput_render.cpp \ - qsgvideonode_rgb.cpp \ - qsgvideonode_yuv.cpp \ - qsgvideonode_texture.cpp -HEADERS += qdeclarativevideooutput_render_p.h \ - qsgvideonode_rgb_p.h \ - qsgvideonode_yuv_p.h \ - qsgvideonode_texture_p.h - -RESOURCES += \ - qtmultimediaquicktools.qrc - -load(qt_module) diff --git a/src/multimediawidgets/doc/snippets/doc_src_qtmultimediawidgets.pro b/src/multimediawidgets/doc/snippets/doc_src_qtmultimediawidgets.pro deleted file mode 100644 index 29c3e9cae..000000000 --- a/src/multimediawidgets/doc/snippets/doc_src_qtmultimediawidgets.pro +++ /dev/null @@ -1,3 +0,0 @@ -#! [0] -QT += multimediawidgets -#! [0] diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro deleted file mode 100644 index 2a9377872..000000000 --- a/src/multimediawidgets/multimediawidgets.pro +++ /dev/null @@ -1,24 +0,0 @@ -# distinct from Qt Multimedia -TARGET = QtMultimediaWidgets -QT = core gui multimedia-private widgets-private -qtHaveModule(opengl) { - QT += openglwidgets - QT_PRIVATE += opengl -} - -HEADERS += \ - qvideowidget_p.h \ - qpaintervideosurface_p.h \ - qtmultimediawidgetdefs.h \ - qvideowidget.h - -SOURCES += \ - qpaintervideosurface.cpp \ - qvideowidget.cpp - -qtConfig(graphicsview) { - SOURCES += qgraphicsvideoitem.cpp - HEADERS += qgraphicsvideoitem.h -} - -load(qt_module) diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro deleted file mode 100644 index cff104ed7..000000000 --- a/src/plugins/plugins.pro +++ /dev/null @@ -1,13 +0,0 @@ -###################################################################### -# -# Qt Multimedia -# -###################################################################### - -TEMPLATE = subdirs -QT_FOR_CONFIG += multimedia-private - -qtHaveModule(quick) { - SUBDIRS += videonode -} - diff --git a/src/plugins/videonode/imx6/imx6.pro b/src/plugins/videonode/imx6/imx6.pro deleted file mode 100644 index 42769a8fe..000000000 --- a/src/plugins/videonode/imx6/imx6.pro +++ /dev/null @@ -1,28 +0,0 @@ -TARGET = imx6vivantevideonode - -QT += multimedia-private qtmultimediaquicktools-private - -QMAKE_USE += gstreamer - -HEADERS += \ - qsgvivantevideonode.h \ - qsgvivantevideomaterialshader.h \ - qsgvivantevideomaterial.h \ - qsgvivantevideonodefactory.h - -SOURCES += \ - qsgvivantevideonode.cpp \ - qsgvivantevideomaterialshader.cpp \ - qsgvivantevideomaterial.cpp \ - qsgvivantevideonodefactory.cpp - -OTHER_FILES += \ - imx6.json - -RESOURCES += \ - imx6.qrc - -PLUGIN_TYPE = video/videonode -PLUGIN_EXTENDS = quick -PLUGIN_CLASS_NAME = QSGVivanteVideoNodeFactory -load(qt_plugin) diff --git a/src/plugins/videonode/videonode.pro b/src/plugins/videonode/videonode.pro deleted file mode 100644 index b8bd43329..000000000 --- a/src/plugins/videonode/videonode.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = subdirs -QT_FOR_CONFIG += gui-private multimedia-private - -qtConfig(gpu_vivante) { - SUBDIRS += imx6 -} diff --git a/src/src.pro b/src/src.pro deleted file mode 100644 index 110c18c42..000000000 --- a/src/src.pro +++ /dev/null @@ -1,41 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += multimedia - -include($$OUT_PWD/multimedia/qtmultimedia-config.pri) -QT_FOR_CONFIG += multimedia-private - -# Everything else depends on multimedia -src_qtmmwidgets.subdir = multimediawidgets -src_qtmmwidgets.depends = multimedia - -src_plugins.subdir = plugins -src_plugins.depends = multimedia - -android:SUBDIRS += android - -qtHaveModule(quick) { - src_qtmultimediaquicktools.subdir = qtmultimediaquicktools - src_qtmultimediaquicktools.depends = multimedia - - src_imports.subdir = imports - src_imports.depends = multimedia src_qtmultimediaquicktools - - # For the videonode plugin - src_plugins.depends += src_qtmultimediaquicktools - - SUBDIRS += \ - src_qtmultimediaquicktools \ - src_imports -} - -# Optional bits -qtHaveModule(widgets) { - SUBDIRS += src_qtmmwidgets - - # If widgets is around, plugins depends on widgets too (imports does not) - src_plugins.depends += src_qtmmwidgets -} - -SUBDIRS += src_plugins - diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro deleted file mode 100644 index c8a501b75..000000000 --- a/tests/auto/auto.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE=subdirs -SUBDIRS += \ - unit \ - integration \ - cmake diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro deleted file mode 100644 index 50a944114..000000000 --- a/tests/auto/cmake/cmake.pro +++ /dev/null @@ -1,7 +0,0 @@ - -# Cause make to do nothing. -TEMPLATE = subdirs - -CMAKE_QT_MODULES_UNDER_TEST = multimedia multimediawidgets - -CONFIG += ctest_testcase diff --git a/tests/auto/integration/integration.pro b/tests/auto/integration/integration.pro deleted file mode 100644 index c61fbd4ee..000000000 --- a/tests/auto/integration/integration.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += multimedia.pro diff --git a/tests/auto/integration/multimedia.pro b/tests/auto/integration/multimedia.pro deleted file mode 100644 index 6632ceef0..000000000 --- a/tests/auto/integration/multimedia.pro +++ /dev/null @@ -1,18 +0,0 @@ - -TEMPLATE = subdirs -SUBDIRS += \ - qaudiodecoderbackend \ - qaudiodeviceinfo \ - qaudioinput \ - qaudiooutput \ - qmediaplayerbackend \ - qcamerabackend \ - qsoundeffect \ - -qtHaveModule(quick) { - SUBDIRS += \ - qdeclarativevideooutput \ - qdeclarativevideooutput_window -} - -!qtHaveModule(widgets): SUBDIRS -= qcamerabackend diff --git a/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro b/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro deleted file mode 100644 index 672bcfa6a..000000000 --- a/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro +++ /dev/null @@ -1,21 +0,0 @@ -TARGET = tst_qaudiodecoderbackend - -QT += multimedia multimedia-private testlib - -# This is more of a system test -CONFIG += testcase -TESTDATA += testdata/* - -INCLUDEPATH += \ - ../../../../src/multimedia/audio - -HEADERS += \ - ../shared/mediafileselector.h - -SOURCES += \ - tst_qaudiodecoderbackend.cpp - -boot2qt: { - # Yocto sysroot does not have gstreamer/wav - QMAKE_CXXFLAGS += -DWAV_SUPPORT_NOT_FORCED -} diff --git a/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro b/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro deleted file mode 100644 index 3eb0905c7..000000000 --- a/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro +++ /dev/null @@ -1,9 +0,0 @@ -TARGET = tst_qaudiodeviceinfo - -QT += core multimedia-private testlib - -# This is more of a system test -CONFIG += testcase - -SOURCES += tst_qaudiodeviceinfo.cpp - diff --git a/tests/auto/integration/qaudioinput/qaudioinput.pro b/tests/auto/integration/qaudioinput/qaudioinput.pro deleted file mode 100644 index b2e2cfd7e..000000000 --- a/tests/auto/integration/qaudioinput/qaudioinput.pro +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = tst_qaudioinput - -QT += core multimedia-private testlib - -# This is more of a system test -CONFIG += testcase - -SOURCES += tst_qaudioinput.cpp diff --git a/tests/auto/integration/qaudiooutput/qaudiooutput.pro b/tests/auto/integration/qaudiooutput/qaudiooutput.pro deleted file mode 100644 index 7d8915375..000000000 --- a/tests/auto/integration/qaudiooutput/qaudiooutput.pro +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = tst_qaudiooutput - -QT += core multimedia-private testlib - -# This is more of a system test -CONFIG += testcase - -SOURCES += tst_qaudiooutput.cpp diff --git a/tests/auto/integration/qcamerabackend/qcamerabackend.pro b/tests/auto/integration/qcamerabackend/qcamerabackend.pro deleted file mode 100644 index 5f7bffa56..000000000 --- a/tests/auto/integration/qcamerabackend/qcamerabackend.pro +++ /dev/null @@ -1,9 +0,0 @@ -TARGET = tst_qcamerabackend - -QT += multimedia-private widgets testlib - -# This is more of a system test -CONFIG += testcase - -SOURCES += tst_qcamerabackend.cpp - diff --git a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro deleted file mode 100644 index 6dd1e8d62..000000000 --- a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro +++ /dev/null @@ -1,20 +0,0 @@ -TARGET = tst_qmediaplayerbackend - -QT += multimedia-private testlib - -# This is more of a system test -CONFIG += testcase - - -SOURCES += \ - tst_qmediaplayerbackend.cpp - -HEADERS += \ - ../shared/mediafileselector.h - -TESTDATA += testdata/* - -boot2qt: { - # OGV testing is unstable with qemu - QMAKE_CXXFLAGS += -DSKIP_OGV_TEST -} diff --git a/tests/auto/integration/qml/qml.pro b/tests/auto/integration/qml/qml.pro deleted file mode 100644 index c0015d9bd..000000000 --- a/tests/auto/integration/qml/qml.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE=app -TARGET=tst_qml -CONFIG += qmltestcase -SOURCES += tst_qml.cpp - - -importFiles.files = soundeffect - -importFiles.path = . -DEPLOYMENT += importFiles diff --git a/tests/auto/integration/qquickvideooutput/qdeclarativevideooutput.pro b/tests/auto/integration/qquickvideooutput/qdeclarativevideooutput.pro deleted file mode 100644 index c4221232a..000000000 --- a/tests/auto/integration/qquickvideooutput/qdeclarativevideooutput.pro +++ /dev/null @@ -1,11 +0,0 @@ -TARGET = tst_qdeclarativevideooutput - -QT += multimedia-private qml testlib quick qtmultimediaquicktools-private -CONFIG += testcase - -RESOURCES += qml.qrc - -SOURCES += \ - tst_qdeclarativevideooutput.cpp - -INCLUDEPATH += ../../../../src/imports/multimedia diff --git a/tests/auto/integration/qquickvideooutput_window/qquickvideooutput_window.pro b/tests/auto/integration/qquickvideooutput_window/qquickvideooutput_window.pro deleted file mode 100644 index eeb1c0135..000000000 --- a/tests/auto/integration/qquickvideooutput_window/qquickvideooutput_window.pro +++ /dev/null @@ -1,11 +0,0 @@ -TARGET = tst_qdeclarativevideooutput_window - -QT += multimedia-private qml testlib quick qtmultimediaquicktools-private -CONFIG += testcase - -RESOURCES += qml.qrc - -SOURCES += \ - tst_qdeclarativevideooutput_window.cpp - -INCLUDEPATH += ../../../../src/imports/multimedia diff --git a/tests/auto/integration/qsoundeffect/qsoundeffect.pro b/tests/auto/integration/qsoundeffect/qsoundeffect.pro deleted file mode 100644 index 868346a2e..000000000 --- a/tests/auto/integration/qsoundeffect/qsoundeffect.pro +++ /dev/null @@ -1,19 +0,0 @@ -TARGET = tst_qsoundeffect - -QT += core multimedia-private testlib - -# This is more of a system test -CONFIG += testcase - -SOURCES += tst_qsoundeffect.cpp - -unix:!mac { - !qtConfig(pulseaudio) { - DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER - } -} - -TESTDATA += test.wav - -RESOURCES += \ - resources.qrc diff --git a/tests/auto/unit/mockbackend/audio.pri b/tests/auto/unit/mockbackend/audio.pri deleted file mode 100644 index 72d0c8204..000000000 --- a/tests/auto/unit/mockbackend/audio.pri +++ /dev/null @@ -1,3 +0,0 @@ -INCLUDEPATH += $$PWD -HEADERS *= \ - $$PWD/mockaudiodecoder.h diff --git a/tests/auto/unit/mockbackend/capture.pri b/tests/auto/unit/mockbackend/capture.pri deleted file mode 100644 index 004388c07..000000000 --- a/tests/auto/unit/mockbackend/capture.pri +++ /dev/null @@ -1,9 +0,0 @@ -HEADERS *= \ - $$PWD/mockcamera.h \ - $$PWD/mockcameraexposure.h \ - $$PWD/mockcamerafocus.h \ - $$PWD/mockcameraimagecapture.h \ - $$PWD/mockcameraimageprocessing.h \ - $$PWD/mockmediarecorder.h \ - $$PWD/mockmediarecorderservice.h \ - $$PWD/mockvideodeviceselector.h \ diff --git a/tests/auto/unit/mockbackend/common.pri b/tests/auto/unit/mockbackend/common.pri deleted file mode 100644 index 72532a53a..000000000 --- a/tests/auto/unit/mockbackend/common.pri +++ /dev/null @@ -1,3 +0,0 @@ -INCLUDEPATH += $$PWD -HEADERS += \ - $$PWD/mockvideosurface.h diff --git a/tests/auto/unit/mockbackend/mockbackend.pri b/tests/auto/unit/mockbackend/mockbackend.pri deleted file mode 100644 index 703bef5e6..000000000 --- a/tests/auto/unit/mockbackend/mockbackend.pri +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDEPATH += $$PWD -LIBS += -L$$PWD -lQtMultimediaMockBackend diff --git a/tests/auto/unit/mockbackend/mockbackend.pro b/tests/auto/unit/mockbackend/mockbackend.pro deleted file mode 100644 index 7e9ffe8b7..000000000 --- a/tests/auto/unit/mockbackend/mockbackend.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = lib -TARGET = QtMultimediaMockBackend -QT = core gui multimedia-private -CONFIG += staticlib - -include(audio.pri) -include(capture.pri) -include(common.pri) -include(player.pri) - -SOURCES += qmockdevicemanager.cpp qmockintegration.cpp -HEADERS += qmockdevicemanager_p.h qmockintegration_p.h diff --git a/tests/auto/unit/mockbackend/player.pri b/tests/auto/unit/mockbackend/player.pri deleted file mode 100644 index e70da9a80..000000000 --- a/tests/auto/unit/mockbackend/player.pri +++ /dev/null @@ -1,5 +0,0 @@ -INCLUDEPATH += $$PWD -HEADERS += \ - $$PWD/mockmediaplayer.h \ - $$PWD/mockmediaplayerservice.h \ - diff --git a/tests/auto/unit/multimedia/multimedia.pro b/tests/auto/unit/multimedia/multimedia.pro deleted file mode 100644 index db963f3b4..000000000 --- a/tests/auto/unit/multimedia/multimedia.pro +++ /dev/null @@ -1,22 +0,0 @@ - -TEMPLATE = subdirs -SUBDIRS += \ - qabstractvideobuffer \ - qabstractvideosurface \ - qaudiorecorder \ - qaudioformat \ - qaudionamespace \ - qcamera \ - qcamerainfo \ - qcameraimagecapture \ - qmediaplayer \ - qmediaplaylist \ - qmediapluginloader \ - qmediarecorder \ - qmediatimerange \ - qvideoframe \ - qvideoframeformat \ -# qwavedecoder \ - qaudiobuffer \ - qaudiodecoder \ - qsamplecache diff --git a/tests/auto/unit/multimedia/qabstractvideobuffer/qabstractvideobuffer.pro b/tests/auto/unit/multimedia/qabstractvideobuffer/qabstractvideobuffer.pro deleted file mode 100644 index f97ea41c3..000000000 --- a/tests/auto/unit/multimedia/qabstractvideobuffer/qabstractvideobuffer.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -TARGET = tst_qabstractvideobuffer - -QT += core multimedia-private testlib - -SOURCES += tst_qabstractvideobuffer.cpp - diff --git a/tests/auto/unit/multimedia/qaudiobuffer/qaudiobuffer.pro b/tests/auto/unit/multimedia/qaudiobuffer/qaudiobuffer.pro deleted file mode 100644 index 8f8f54ac3..000000000 --- a/tests/auto/unit/multimedia/qaudiobuffer/qaudiobuffer.pro +++ /dev/null @@ -1,10 +0,0 @@ -QT += multimedia testlib -QT -= gui - -TARGET = tst_qaudiobuffer -CONFIG += testcase -CONFIG -= app_bundle - -TEMPLATE = app - -SOURCES += tst_qaudiobuffer.cpp diff --git a/tests/auto/unit/multimedia/qaudiodecoder/qaudiodecoder.pro b/tests/auto/unit/multimedia/qaudiodecoder/qaudiodecoder.pro deleted file mode 100644 index 4d623edce..000000000 --- a/tests/auto/unit/multimedia/qaudiodecoder/qaudiodecoder.pro +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = tst_qaudiodecoder -CONFIG += testcase - -QT += multimedia multimedia-private testlib gui - -include (../../mockbackend/mockbackend.pri) - -SOURCES += tst_qaudiodecoder.cpp diff --git a/tests/auto/unit/multimedia/qaudioformat/qaudioformat.pro b/tests/auto/unit/multimedia/qaudioformat/qaudioformat.pro deleted file mode 100644 index 408200a85..000000000 --- a/tests/auto/unit/multimedia/qaudioformat/qaudioformat.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -TARGET = tst_qaudioformat - -QT += core multimedia-private testlib - -SOURCES += tst_qaudioformat.cpp - diff --git a/tests/auto/unit/multimedia/qaudionamespace/qaudionamespace.pro b/tests/auto/unit/multimedia/qaudionamespace/qaudionamespace.pro deleted file mode 100644 index cfe502dc6..000000000 --- a/tests/auto/unit/multimedia/qaudionamespace/qaudionamespace.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -TARGET = tst_qaudionamespace - -QT += core multimedia-private testlib - -SOURCES += tst_qaudionamespace.cpp - diff --git a/tests/auto/unit/multimedia/qaudiorecorder/qaudiorecorder.pro b/tests/auto/unit/multimedia/qaudiorecorder/qaudiorecorder.pro deleted file mode 100644 index 8137016cc..000000000 --- a/tests/auto/unit/multimedia/qaudiorecorder/qaudiorecorder.pro +++ /dev/null @@ -1,9 +0,0 @@ -CONFIG += testcase -TARGET = tst_qaudiorecorder - -QT += multimedia-private testlib - -SOURCES += tst_qaudiorecorder.cpp - -include (../../mockbackend/mockbackend.pri) - diff --git a/tests/auto/unit/multimedia/qcamera/qcamera.pro b/tests/auto/unit/multimedia/qcamera/qcamera.pro deleted file mode 100644 index ceb57f40c..000000000 --- a/tests/auto/unit/multimedia/qcamera/qcamera.pro +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG += testcase -TARGET = tst_qcamera - -QT += multimedia-private testlib - -include (../../mockbackend/mockbackend.pri) - -SOURCES += tst_qcamera.cpp diff --git a/tests/auto/unit/multimedia/qcameraimagecapture/qcameraimagecapture.pro b/tests/auto/unit/multimedia/qcameraimagecapture/qcameraimagecapture.pro deleted file mode 100644 index cf9bf82ea..000000000 --- a/tests/auto/unit/multimedia/qcameraimagecapture/qcameraimagecapture.pro +++ /dev/null @@ -1,9 +0,0 @@ -CONFIG += testcase -TARGET = tst_qcameraimagecapture - -QT += multimedia-private testlib - -SOURCES += \ - tst_qcameraimagecapture.cpp - -include (../../mockbackend/mockbackend.pri) diff --git a/tests/auto/unit/multimedia/qcamerainfo/qcamerainfo.pro b/tests/auto/unit/multimedia/qcamerainfo/qcamerainfo.pro deleted file mode 100644 index cc991ac56..000000000 --- a/tests/auto/unit/multimedia/qcamerainfo/qcamerainfo.pro +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG += testcase -TARGET = tst_qcamerainfo - -QT += multimedia-private testlib - -include (../../mockbackend/mockbackend.pri) - -SOURCES += tst_qcamerainfo.cpp diff --git a/tests/auto/unit/multimedia/qmediaencoder/qmediarecorder.pro b/tests/auto/unit/multimedia/qmediaencoder/qmediarecorder.pro deleted file mode 100644 index e1523d3bf..000000000 --- a/tests/auto/unit/multimedia/qmediaencoder/qmediarecorder.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase -TARGET = tst_qmediarecorder -QT += multimedia-private testlib -SOURCES += tst_qmediarecorder.cpp - -include (../../mockbackend/mockbackend.pri) diff --git a/tests/auto/unit/multimedia/qmediaplayer/qmediaplayer.pro b/tests/auto/unit/multimedia/qmediaplayer/qmediaplayer.pro deleted file mode 100644 index 6e0dded2c..000000000 --- a/tests/auto/unit/multimedia/qmediaplayer/qmediaplayer.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -TARGET = tst_qmediaplayer -QT += network multimedia-private testlib -SOURCES += tst_qmediaplayer.cpp -RESOURCES += testdata.qrc - -include (../../mockbackend/mockbackend.pri) diff --git a/tests/auto/unit/multimedia/qmediaplaylist/qmediaplaylist.pro b/tests/auto/unit/multimedia/qmediaplaylist/qmediaplaylist.pro deleted file mode 100644 index b0ea77434..000000000 --- a/tests/auto/unit/multimedia/qmediaplaylist/qmediaplaylist.pro +++ /dev/null @@ -1,9 +0,0 @@ -CONFIG += testcase -TARGET = tst_qmediaplaylist - -QT += multimedia-private testlib - -SOURCES += \ - tst_qmediaplaylist.cpp - -TESTDATA += testdata/* diff --git a/tests/auto/unit/multimedia/qmediapluginloader/qmediapluginloader.pro b/tests/auto/unit/multimedia/qmediapluginloader/qmediapluginloader.pro deleted file mode 100644 index 90b02ac59..000000000 --- a/tests/auto/unit/multimedia/qmediapluginloader/qmediapluginloader.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase -TARGET = tst_qmediapluginloader - -QT += multimedia-private testlib - -SOURCES += tst_qmediapluginloader.cpp diff --git a/tests/auto/unit/multimedia/qmediatimerange/qmediatimerange.pro b/tests/auto/unit/multimedia/qmediatimerange/qmediatimerange.pro deleted file mode 100644 index c59c3d8df..000000000 --- a/tests/auto/unit/multimedia/qmediatimerange/qmediatimerange.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -TARGET = tst_qmediatimerange - -QT += multimedia-private testlib - -SOURCES += tst_qmediatimerange.cpp - diff --git a/tests/auto/unit/multimedia/qsamplecache/qsamplecache.pro b/tests/auto/unit/multimedia/qsamplecache/qsamplecache.pro deleted file mode 100644 index 02ca7cb18..000000000 --- a/tests/auto/unit/multimedia/qsamplecache/qsamplecache.pro +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG += testcase -TARGET = tst_qsamplecache - -QT += multimedia-private testlib - -SOURCES += tst_qsamplecache.cpp - -TESTDATA += testdata/* diff --git a/tests/auto/unit/multimedia/qvideoframe/qvideoframe.pro b/tests/auto/unit/multimedia/qvideoframe/qvideoframe.pro deleted file mode 100644 index 2d7bc0360..000000000 --- a/tests/auto/unit/multimedia/qvideoframe/qvideoframe.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -TARGET = tst_qvideoframe - -QT += core multimedia-private testlib - -SOURCES += tst_qvideoframe.cpp - diff --git a/tests/auto/unit/multimedia/qvideoframeformat/qvideosurfaceformat.pro b/tests/auto/unit/multimedia/qvideoframeformat/qvideosurfaceformat.pro deleted file mode 100644 index 3644f36b7..000000000 --- a/tests/auto/unit/multimedia/qvideoframeformat/qvideosurfaceformat.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -TARGET = tst_qvideoframeformat - -QT += core multimedia-private testlib - -SOURCES += tst_qvideoframeformat.cpp - diff --git a/tests/auto/unit/multimedia/qwavedecoder/qwavedecoder.pro b/tests/auto/unit/multimedia/qwavedecoder/qwavedecoder.pro deleted file mode 100644 index 672cf3a03..000000000 --- a/tests/auto/unit/multimedia/qwavedecoder/qwavedecoder.pro +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = tst_qwavedecoder -SOURCES += tst_qwavedecoder.cpp \ - -QT += multimedia-private testlib network -CONFIG += testcase - -TESTDATA += data/* diff --git a/tests/auto/unit/multimediawidgets/multimediawidgets.pro b/tests/auto/unit/multimediawidgets/multimediawidgets.pro deleted file mode 100644 index 44a160af6..000000000 --- a/tests/auto/unit/multimediawidgets/multimediawidgets.pro +++ /dev/null @@ -1,15 +0,0 @@ - -TEMPLATE = subdirs -SUBDIRS += \ - qcamerawidgets \ - qmediaplayerwidgets \ - -# Tests depending on private interfaces should only be built if -# these interfaces are exported. -qtConfig(private_tests) { - SUBDIRS += \ - qgraphicsvideoitem \ - qpaintervideosurface \ - qvideowidget -} - diff --git a/tests/auto/unit/multimediawidgets/qcamerawidgets/qcamerawidgets.pro b/tests/auto/unit/multimediawidgets/qcamerawidgets/qcamerawidgets.pro deleted file mode 100644 index c9d92a040..000000000 --- a/tests/auto/unit/multimediawidgets/qcamerawidgets/qcamerawidgets.pro +++ /dev/null @@ -1,10 +0,0 @@ -CONFIG += testcase -TARGET = tst_qcamerawidgets - -QT += multimedia-private multimediawidgets-private testlib - -include (../../mockbackend/mockbackend.pri) - -SOURCES += tst_qcamerawidgets.cpp - -QT+=widgets diff --git a/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/qgraphicsvideoitem.pro deleted file mode 100644 index 27d0ff9a4..000000000 --- a/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/qgraphicsvideoitem.pro +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG += testcase -TARGET = tst_qgraphicsvideoitem - -QT += multimedia-private multimediawidgets-private testlib - -SOURCES += tst_qgraphicsvideoitem.cpp - -QT+=widgets diff --git a/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/qmediaplayerwidgets.pro b/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/qmediaplayerwidgets.pro deleted file mode 100644 index fd609105a..000000000 --- a/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/qmediaplayerwidgets.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase -TARGET = tst_qmediaplayerwidgets -QT += network multimedia-private multimediawidgets-private testlib widgets -SOURCES += tst_qmediaplayerwidgets.cpp - -include (../../mockbackend/mockbackend.pri) diff --git a/tests/auto/unit/multimediawidgets/qvideowidget/qvideowidget.pro b/tests/auto/unit/multimediawidgets/qvideowidget/qvideowidget.pro deleted file mode 100644 index b729dbc23..000000000 --- a/tests/auto/unit/multimediawidgets/qvideowidget/qvideowidget.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase -TARGET = tst_qvideowidget - -QT += multimedia-private multimediawidgets-private testlib widgets - -SOURCES += tst_qvideowidget.cpp diff --git a/tests/auto/unit/qml/qdeclarativemultimediaglobal/qdeclarativemultimediaglobal.pro b/tests/auto/unit/qml/qdeclarativemultimediaglobal/qdeclarativemultimediaglobal.pro deleted file mode 100644 index 54ce3f675..000000000 --- a/tests/auto/unit/qml/qdeclarativemultimediaglobal/qdeclarativemultimediaglobal.pro +++ /dev/null @@ -1,13 +0,0 @@ -TARGET = tst_qdeclarativemultimediaglobal -CONFIG += warn_on qmltestcase - -QT += multimedia-private - -include (../../mockbackend/mockbackend.pri) - -SOURCES += \ - tst_qdeclarativemultimediaglobal.cpp - - -OTHER_FILES += \ - tst_qdeclarativemultimediaglobal.qml diff --git a/tests/auto/unit/qml/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/unit/qml/qdeclarativevideo/qdeclarativevideo.pro deleted file mode 100644 index 8428f19dd..000000000 --- a/tests/auto/unit/qml/qdeclarativevideo/qdeclarativevideo.pro +++ /dev/null @@ -1,18 +0,0 @@ -CONFIG += testcase -TARGET = tst_qdeclarativevideo - -QT += multimedia-private qml testlib - -include (../../mockbackend/mockbackend.pri) - -HEADERS += \ - ../../../../src/imports/multimedia/qdeclarativevideo_p.h \ - ../../../../src/imports/multimedia/qdeclarativemediabase_p.h \ - ../../../../src/imports/multimedia/qdeclarativemediametadata_p.h - -SOURCES += \ - tst_qdeclarativevideo.cpp \ - ../../../../src/imports/multimedia/qdeclarativevideo.cpp \ - ../../../../src/imports/multimedia/qdeclarativemediabase.cpp - -INCLUDEPATH += ../../../../src/imports/multimedia diff --git a/tests/auto/unit/qml/qml.pro b/tests/auto/unit/qml/qml.pro deleted file mode 100644 index 786d3220d..000000000 --- a/tests/auto/unit/qml/qml.pro +++ /dev/null @@ -1,11 +0,0 @@ - -TEMPLATE = subdirs -SUBDIRS += \ - qdeclarativemultimediaglobal \ - qdeclarativeaudio \ - -disabled { - SUBDIRS += \ - qdeclarativevideo -} - diff --git a/tests/auto/unit/unit.pro b/tests/auto/unit/unit.pro deleted file mode 100644 index d5e9b2713..000000000 --- a/tests/auto/unit/unit.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = subdirs -CONFIG += ordered - -SUBDIRS += mockbackend multimedia -qtHaveModule(widgets): SUBDIRS += multimediawidgets -qtHaveModule(qml): SUBDIRS += qml diff --git a/tests/tests.pro b/tests/tests.pro deleted file mode 100644 index 2bd49bd97..000000000 --- a/tests/tests.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += auto - -# Disabled since we don't have any source. -# SUBDIRS += benchmarks manual |