QSoundEffect supported in Qt6 but needs conditional code rework

This commit is contained in:
nhmall
2022-04-27 07:40:40 -04:00
parent 4d62f418f0
commit e2bd117c61

View File

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