summaryrefslogtreecommitdiff
path: root/src/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/CMakeLists.txt4
-rw-r--r--src/multimedia/windows/qcomptr_p.h (renamed from src/multimedia/windows/qwindowsiupointer_p.h)4
-rw-r--r--src/multimedia/windows/qwindowsaudiodevice_p.h2
-rw-r--r--src/multimedia/windows/qwindowsaudiosink_p.h2
-rw-r--r--src/multimedia/windows/qwindowsaudioutils_p.h2
-rw-r--r--src/multimedia/windows/qwindowsmediadevices_p.h2
-rw-r--r--src/multimedia/windows/qwindowsresampler_p.h2
7 files changed, 9 insertions, 9 deletions
diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index 7e46c7ff9..089d88c8e 100644
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -213,7 +213,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_wmf
windows/qwindowsresampler.cpp windows/qwindowsresampler_p.h
windows/qwindowsmultimediautils.cpp windows/qwindowsmultimediautils_p.h
windows/qwindowsmfdefs.cpp windows/qwindowsmfdefs_p.h
- windows/qwindowsiupointer_p.h
+ windows/qcomptr_p.h
INCLUDE_DIRECTORIES
windows
LIBRARIES
@@ -234,7 +234,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_wmf AND MINGW
windows/qwindowsresampler.cpp windows/qwindowsresampler_p.h
windows/qwindowsmultimediautils.cpp windows/qwindowsmultimediautils_p.h
windows/qwindowsmfdefs.cpp windows/qwindowsmfdefs_p.h
- windows/qwindowsiupointer_p.h
+ windows/qcomptr_p.h
)
qt_internal_extend_target(Multimedia CONDITION WASM
diff --git a/src/multimedia/windows/qwindowsiupointer_p.h b/src/multimedia/windows/qcomptr_p.h
index 1fff76e2c..fd63c4a32 100644
--- a/src/multimedia/windows/qwindowsiupointer_p.h
+++ b/src/multimedia/windows/qcomptr_p.h
@@ -1,8 +1,8 @@
// Copyright (C) 2021 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-#ifndef QWINDOWSIUPOINTER_H
-#define QWINDOWSIUPOINTER_H
+#ifndef QCOMPTR_P_H
+#define QCOMPTR_P_H
//
// W A R N I N G
diff --git a/src/multimedia/windows/qwindowsaudiodevice_p.h b/src/multimedia/windows/qwindowsaudiodevice_p.h
index b981a0ed6..12ee0e58e 100644
--- a/src/multimedia/windows/qwindowsaudiodevice_p.h
+++ b/src/multimedia/windows/qwindowsaudiodevice_p.h
@@ -24,7 +24,7 @@
#include <QtMultimedia/qaudiodevice.h>
#include <private/qaudiosystem_p.h>
#include <private/qaudiodevice_p.h>
-#include <qwindowsiupointer_p.h>
+#include <qcomptr_p.h>
struct IMMDevice;
diff --git a/src/multimedia/windows/qwindowsaudiosink_p.h b/src/multimedia/windows/qwindowsaudiosink_p.h
index c1ca2e81c..95bc05e11 100644
--- a/src/multimedia/windows/qwindowsaudiosink_p.h
+++ b/src/multimedia/windows/qwindowsaudiosink_p.h
@@ -27,7 +27,7 @@
#include <QtMultimedia/qaudio.h>
#include <QtMultimedia/qaudiodevice.h>
#include <private/qaudiosystem_p.h>
-#include <qwindowsiupointer_p.h>
+#include <qcomptr_p.h>
#include <qwindowsresampler_p.h>
#include <audioclient.h>
diff --git a/src/multimedia/windows/qwindowsaudioutils_p.h b/src/multimedia/windows/qwindowsaudioutils_p.h
index 5254ef704..379a8b762 100644
--- a/src/multimedia/windows/qwindowsaudioutils_p.h
+++ b/src/multimedia/windows/qwindowsaudioutils_p.h
@@ -17,7 +17,7 @@
#include <qaudioformat.h>
#include <QtCore/qt_windows.h>
-#include <private/qwindowsiupointer_p.h>
+#include <private/qcomptr_p.h>
#include <mmreg.h>
#include <optional>
diff --git a/src/multimedia/windows/qwindowsmediadevices_p.h b/src/multimedia/windows/qwindowsmediadevices_p.h
index 154f29c6e..4aa1e6577 100644
--- a/src/multimedia/windows/qwindowsmediadevices_p.h
+++ b/src/multimedia/windows/qwindowsmediadevices_p.h
@@ -16,7 +16,7 @@
//
#include <private/qplatformmediadevices_p.h>
-#include <private/qwindowsiupointer_p.h>
+#include <private/qcomptr_p.h>
#include <qaudiodevice.h>
diff --git a/src/multimedia/windows/qwindowsresampler_p.h b/src/multimedia/windows/qwindowsresampler_p.h
index a59cc5f2e..351c4259c 100644
--- a/src/multimedia/windows/qwindowsresampler_p.h
+++ b/src/multimedia/windows/qwindowsresampler_p.h
@@ -19,7 +19,7 @@
#include <qbytearray.h>
#include <qbytearrayview.h>
#include <qaudioformat.h>
-#include <private/qwindowsiupointer_p.h>
+#include <private/qcomptr_p.h>
#include <qt_windows.h>
#include <mftransform.h>