From 199a76eaaad63b74f2be63a430f0b8f812ac0b1a Mon Sep 17 00:00:00 2001
From: Ray Chason <ray.chason@protonmail.com>
Date: Sun, 4 Jun 2023 18:05:09 -0400
Subject: [PATCH] Fix compile on Qt 4

---
 sys/unix/hints/include/multiw-2.370 |  2 ++
 win/Qt/qt_bind.cpp                  | 11 ++---------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/sys/unix/hints/include/multiw-2.370 b/sys/unix/hints/include/multiw-2.370
index f671335bb..2218207f5 100644
--- a/sys/unix/hints/include/multiw-2.370
+++ b/sys/unix/hints/include/multiw-2.370
@@ -145,7 +145,9 @@ ifdef WANT_WIN_QT
 WINCFLAGS += -DQT_GRAPHICS
 WINSRC += $(WINQTSRC)
 WINOBJ0 += $(WINQTOBJ)
+ifndef WANT_WIN_QT4
 SNDCFLAGS += -DSND_LIB_QTSOUND
+endif #! WANT_WIN_QT4
 HAVE_SNDLIB = 1
 NEEDS_SND_USERSOUNDS = 1
 NEEDS_SND_SEAUTOMAP = 1
diff --git a/win/Qt/qt_bind.cpp b/win/Qt/qt_bind.cpp
index 4e87b7800..a287c19dc 100644
--- a/win/Qt/qt_bind.cpp
+++ b/win/Qt/qt_bind.cpp
@@ -1043,7 +1043,7 @@ boolean NetHackQtBind::msgs_initd = false;
 static void Qt_positionbar(char *) {}
 #endif
 
-#if defined(SND_LIB_QTSOUND) && !defined(NO_QT_SOUND)
+#if defined(SND_LIB_QTSOUND) && !defined(QT_NO_SOUND)
 void NetHackQtBind::qtsound_init_nhsound(void)
 {
 }
@@ -1069,15 +1069,11 @@ void NetHackQtBind::qtsound_ambience(int32_t ambienceid UNUSED, int32_t ambience
 void NetHackQtBind::qtsound_verbal(char *text UNUSED, int32_t gender UNUSED, int32_t tone UNUSED, int32_t vol UNUSED, int32_t moreinfo UNUSED)
 {
 }
-#endif
 
-#if defined(USER_SOUNDS) && !defined(QT_NO_SOUND)
 QSoundEffect *effect = NULL;
-#endif
 
 void NetHackQtBind::qtsound_play_usersound(char *filename, int32_t volume, int32_t idx UNUSED)
 {
-#if defined(USER_SOUNDS) && !defined(QT_NO_SOUND)
     if (!effect)
         effect = new QSoundEffect(nethack_qt_::NetHackQtBind::mainWidget());
     if (effect) {
@@ -1086,11 +1082,8 @@ void NetHackQtBind::qtsound_play_usersound(char *filename, int32_t volume, int32
         effect->setSource(QUrl::fromLocalFile(filename));
         effect->play();
     }
-#else
-    nhUse(filename);
-    nhUse(volume);
-#endif
 }
+#endif
 
 } // namespace nethack_qt_