Revert "Qt6 QSoundEffect on macOS"

This reverts commit f6149904c300bf1658d1c04a7d47a86fad77a1de.

diff --git a/sys/unix/hints/macOS.370 b/sys/unix/hints/macOS.370
index 6ff3931ff2381158699b83cf01fd52660d58a5fb..088b3cdd45f07697adb37a4bae5fee0278d779df 100755 (executable)
--- a/sys/unix/hints/macOS.370
+++ b/sys/unix/hints/macOS.370
@@ -163,7 +163,7 @@ ifdef WANT_WIN_QT6
 QTCXXFLAGS += -std=c++17 -I $(QTDIR)/include -I $(QTDIR)/include/QtCore
 MOC = moc
 MOCPATH = $(QTDIR)/share/qt/libexec/moc
-WINLIB += -F $(QTDIR)/Frameworks -framework QtCore -framework QtGui -framework QtWidgets -framework QtMultimedia
+WINLIB += -F $(QTDIR)/Frameworks -framework QtCore -framework QtGui -framework QtWidgets
 endif    # WANT_WIN_QT6
 WINSRC += $(WINQTSRC)
 WINOBJ0 += $(WINQTOBJ)

diff --git a/win/Qt/qt_bind.cpp b/win/Qt/qt_bind.cpp
index e013c0b78991028ea2d5b8aa2f986ed9a6a02cd8..2ddace2549b8b5a8ac19d0f62572e69aaf8d470e 100644 (file)
--- a/win/Qt/qt_bind.cpp
+++ b/win/Qt/qt_bind.cpp
@@ -19,11 +19,7 @@ extern "C" {
 #else
 /* Qt6 or above */
 #include <QtWidgets/QtWidgets>
-#ifdef MACOS
-#include <QtMultimedia/QSoundEffect>
-#else
 #include <QSoundEffect>
-#endif
 #endif  /* QT_VERSION */
 #include "qt_post.h"
 #include "qt_bind.h"