summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmake/FindGObject.cmake1
-rw-r--r--cmake/FindGStreamer.cmake11
-rw-r--r--coin/module_config.yaml3
-rw-r--r--src/multimedia/CMakeLists.txt4
-rw-r--r--src/multimedia/audio/qaudioformat.cpp5
-rw-r--r--src/multimedia/audio/qaudioformat.h4
-rw-r--r--src/multimedia/camera/qcamera.h4
-rw-r--r--src/multimedia/configure.cmake4
-rw-r--r--src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h1
-rw-r--r--src/multimedia/platform/qplatformmediadevices_p.h2
-rw-r--r--src/multimedia/platform/qplatformmediaformatinfo_p.h2
-rw-r--r--src/multimedia/platform/qplatformmediaintegration.cpp2
-rw-r--r--src/multimedia/qmediatimerange.h2
13 files changed, 33 insertions, 12 deletions
diff --git a/cmake/FindGObject.cmake b/cmake/FindGObject.cmake
index 0880665fd..dc207a2ca 100644
--- a/cmake/FindGObject.cmake
+++ b/cmake/FindGObject.cmake
@@ -15,6 +15,7 @@
include(CMakeFindDependencyMacro)
find_dependency(GLIB2)
+qt_internal_disable_find_package_global_promotion(GLIB2::GLIB2)
if(NOT TARGET GObject::GObject)
find_package(PkgConfig QUIET)
diff --git a/cmake/FindGStreamer.cmake b/cmake/FindGStreamer.cmake
index ef9edd485..0624c1a77 100644
--- a/cmake/FindGStreamer.cmake
+++ b/cmake/FindGStreamer.cmake
@@ -138,3 +138,14 @@ if(GStreamer_FOUND AND NOT TARGET GStreamer::GStreamer)
GStreamer::Allocators
)
endif()
+
+if(TARGET PkgConfig::PC_GSTREAMER_GL)
+ get_target_property(_qt_incs PkgConfig::PC_GSTREAMER_GL INTERFACE_INCLUDE_DIRECTORIES)
+ set(__qt_fixed_incs)
+ foreach(path IN LISTS _qt_incs)
+ if(IS_DIRECTORY "${path}")
+ list(APPEND __qt_fixed_incs "${path}")
+ endif()
+ endforeach()
+ set_property(TARGET PkgConfig::PC_GSTREAMER_GL PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${__qt_fixed_incs}")
+endif()
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 43c421d56..6c1ee3f7b 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -5,6 +5,7 @@ accept_configuration:
not_contains_value: Disable
instructions:
- Build: []
+ Build:
+ - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml"
Test: []
diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index e91304352..6d79e11bc 100644
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -127,7 +127,7 @@ endif()
## Scopes:
#####################################################################
-qt_internal_extend_target(Multimedia CONDITION WIN32
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_wmf
SOURCES
platform/windows/audio/qwindowsaudiodeviceinfo.cpp platform/windows/audio/qwindowsaudiodeviceinfo_p.h
platform/windows/audio/qwindowsaudioinput.cpp platform/windows/audio/qwindowsaudioinput_p.h
@@ -423,7 +423,7 @@ qt_internal_extend_target(Multimedia CONDITION APPLE AND NOT IOS AND NOT TVOS AN
${FWAudioUnit}
)
-qt_internal_extend_target(Multimedia CONDITION QNX
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_mmrenderer
SOURCES
platform/qnx/audio/neutrinoserviceplugin.cpp platform/qnx/audio/neutrinoserviceplugin_p.h
platform/qnx/audio/qnxaudiodeviceinfo.cpp platform/qnx/audio/qnxaudiodeviceinfo_p.h
diff --git a/src/multimedia/audio/qaudioformat.cpp b/src/multimedia/audio/qaudioformat.cpp
index 404dda49e..dc9921bc6 100644
--- a/src/multimedia/audio/qaudioformat.cpp
+++ b/src/multimedia/audio/qaudioformat.cpp
@@ -196,6 +196,11 @@ qint32 QAudioFormat::bytesForDuration(qint64 duration) const
*/
qint64 QAudioFormat::durationForBytes(qint32 bytes) const
{
+ // avoid compiler warnings about unused variables. [[maybe_unused]] in the header
+ // gives compiler errors on older gcc versions
+ Q_UNUSED(bitfields);
+ Q_UNUSED(reserved);
+
if (!isValid() || bytes <= 0)
return 0;
diff --git a/src/multimedia/audio/qaudioformat.h b/src/multimedia/audio/qaudioformat.h
index 931bc1e24..ca0e9a6f6 100644
--- a/src/multimedia/audio/qaudioformat.h
+++ b/src/multimedia/audio/qaudioformat.h
@@ -117,8 +117,8 @@ private:
SampleFormat m_sampleFormat = SampleFormat::Unknown;
int m_sampleRate = 0;
short m_channelCount = 0;
- [[maybe_unused]]short bitfields = 0;
- [[maybe_unused]]quint64 reserved = 0;
+ short bitfields = 0;
+ quint64 reserved = 0;
};
#ifndef QT_NO_DEBUG_STREAM
diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h
index 90ddc539e..6c2e226f6 100644
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -175,7 +175,7 @@ public:
CustomFocusPoint = 0x10,
FocusDistance = 0x20
};
- Q_DECLARE_FLAGS(Features, Feature);
+ Q_DECLARE_FLAGS(Features, Feature)
explicit QCamera(QObject *parent = nullptr);
explicit QCamera(const QCameraInfo& cameraInfo, QObject *parent = nullptr);
@@ -310,7 +310,7 @@ private:
friend class QCameraInfo;
};
-Q_DECLARE_OPERATORS_FOR_FLAGS(QCamera::Features);
+Q_DECLARE_OPERATORS_FOR_FLAGS(QCamera::Features)
QT_END_NAMESPACE
diff --git a/src/multimedia/configure.cmake b/src/multimedia/configure.cmake
index d5ddb8b17..3f41d215c 100644
--- a/src/multimedia/configure.cmake
+++ b/src/multimedia/configure.cmake
@@ -94,7 +94,7 @@ qt_feature("linux_v4l" PRIVATE
)
qt_feature("mmrenderer" PUBLIC PRIVATE
LABEL "MMRenderer"
- CONDITION MMRenderer_FOUND
+ CONDITION MMRenderer_FOUND AND false
EMIT_IF QNX
)
qt_feature_definition("mmrenderer" "QT_NO_MMRENDERER" NEGATE VALUE "1")
@@ -110,7 +110,7 @@ qt_feature("wmsdk" PRIVATE
)
qt_feature("wmf" PRIVATE
LABEL "Windows Media Foundation"
- CONDITION WIN32 AND WMF_FOUND
+ CONDITION WIN32 AND WMF_FOUND AND QT_FEATURE_wmsdk
)
qt_configure_add_summary_section(NAME "Qt Multimedia")
qt_configure_add_summary_entry(ARGS "alsa")
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h
index 605eeef4b..6c6f5e40a 100644
--- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h
+++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h
@@ -56,6 +56,7 @@
#include <QtCore/QSet>
#include <QtCore/QResource>
#include <QtCore/QUrl>
+#include <QtCore/QTimer>
#include <private/qplatformmediaplayer_p.h>
#include <QtMultimedia/QMediaPlayer>
diff --git a/src/multimedia/platform/qplatformmediadevices_p.h b/src/multimedia/platform/qplatformmediadevices_p.h
index d0de397b2..6fdc90598 100644
--- a/src/multimedia/platform/qplatformmediadevices_p.h
+++ b/src/multimedia/platform/qplatformmediadevices_p.h
@@ -63,7 +63,7 @@ class QAbstractAudioInput;
class QAbstractAudioOutput;
class QAudioFormat;
-class Q_AUTOTEST_EXPORT QPlatformMediaDevices
+class Q_MULTIMEDIA_EXPORT QPlatformMediaDevices
{
public:
QPlatformMediaDevices();
diff --git a/src/multimedia/platform/qplatformmediaformatinfo_p.h b/src/multimedia/platform/qplatformmediaformatinfo_p.h
index 359648f81..a1b93f5f4 100644
--- a/src/multimedia/platform/qplatformmediaformatinfo_p.h
+++ b/src/multimedia/platform/qplatformmediaformatinfo_p.h
@@ -56,7 +56,7 @@
QT_BEGIN_NAMESPACE
-class Q_AUTOTEST_EXPORT QPlatformMediaFormatInfo
+class Q_MULTIMEDIA_EXPORT QPlatformMediaFormatInfo
{
public:
QPlatformMediaFormatInfo();
diff --git a/src/multimedia/platform/qplatformmediaintegration.cpp b/src/multimedia/platform/qplatformmediaintegration.cpp
index f93e947ae..cf5abb9e9 100644
--- a/src/multimedia/platform/qplatformmediaintegration.cpp
+++ b/src/multimedia/platform/qplatformmediaintegration.cpp
@@ -54,7 +54,7 @@ using PlatformIntegration = QAlsaIntegration;
#elif QT_CONFIG(avfoundation)
#include <private/qdarwinintegration_p.h>
using PlatformIntegration = QDarwinIntegration;
-#elif defined(Q_OS_WIN)
+#elif QT_CONFIG(wmf)
#include <private/qwindowsintegration_p.h>
using PlatformIntegration = QWindowsIntegration;
#elif defined(Q_OS_ANDROID)
diff --git a/src/multimedia/qmediatimerange.h b/src/multimedia/qmediatimerange.h
index b61ed9c59..2a8e948c3 100644
--- a/src/multimedia/qmediatimerange.h
+++ b/src/multimedia/qmediatimerange.h
@@ -42,6 +42,8 @@
#include <QtMultimedia/qtmultimediaglobal.h>
#include <QtCore/qshareddata.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qmetatype.h>
QT_BEGIN_NAMESPACE
View Lorry Controller Status