From 75f3008123df3c07303917536fd0e75299cfb853 Mon Sep 17 00:00:00 2001 From: nhmall Date: Wed, 27 Apr 2022 19:00:18 -0400 Subject: [PATCH] Revert "Qt6 QSoundEffect on macOS" This reverts commit f6149904c300bf1658d1c04a7d47a86fad77a1de. --- sys/unix/hints/macOS.370 | 2 +- win/Qt/qt_bind.cpp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/unix/hints/macOS.370 b/sys/unix/hints/macOS.370 index 6ff3931ff..088b3cdd4 100755 --- 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 e013c0b78..2ddace254 100644 --- a/win/Qt/qt_bind.cpp +++ b/win/Qt/qt_bind.cpp @@ -19,11 +19,7 @@ extern "C" { #else /* Qt6 or above */ #include -#ifdef MACOS -#include -#else #include -#endif #endif /* QT_VERSION */ #include "qt_post.h" #include "qt_bind.h"