From: nhmall <nhmall@nethack.org>
Date: Wed, 27 Apr 2022 11:40:40 +0000 (-0400)
Subject: QSoundEffect supported in Qt6 but needs conditional code rework
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2bd117c61b979f597d99ccb3fdf34cc3343344b;p=nethack

QSoundEffect supported in Qt6 but needs conditional code rework
---

diff --git a/win/Qt/qt_bind.cpp b/win/Qt/qt_bind.cpp
index 4b1950a21..88935d70f 100644
--- a/win/Qt/qt_bind.cpp
+++ b/win/Qt/qt_bind.cpp
@@ -18,8 +18,7 @@ extern "C" {
 #include <QtMultimedia/QSoundEffect>
 #else
 #include <QtWidgets/QtWidgets>
-#undef QT_NO_SOUND
-#define QT_NO_SOUND 1
+#include <QSoundEffect>
 #endif
 #include "qt_post.h"
 #include "qt_bind.h"
@@ -1100,9 +1099,7 @@ struct window_procs Qt_procs = {
 #ifndef WIN32
 extern "C" void play_usersound(const char *, int);
 
-#if QT_VERSION < 0x060000
 QSoundEffect *effect = NULL;
-#endif
 
 /* called from core, sounds.c */
 void