diff options
| author |  Fabio Bas | 2012-09-25 13:15:57 +0000 |
|---|---|---|
| committer | Fabio Bas | 2012-09-25 13:15:57 +0000 |
| commit | 4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c (patch) | |
| tree | 2a36735ae8685b0d6011f1bfdf0d27ec6211089b /src/modules/snd/libkvisnd.cpp | |
| parent | Properly sort the console windows when sorting by name is selected in the tre... (diff) | |
| download | KVIrc-4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c.tar.gz KVIrc-4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c.tar.bz2 KVIrc-4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c.zip | |
qt5 support (sip): code only, no touch to build system by now
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6251 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/snd/libkvisnd.cpp')
| -rw-r--r-- | src/modules/snd/libkvisnd.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index 5f62e929f..4db392865 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -34,7 +34,12 @@ #include "KviLocale.h" #include "KviQString.h" -#include <QSound> +#warning in libkvisnd to use QSound we need proper cmake rules and includes for QtMultimedia + +#if (QT_VERSION < 0x050000) + #include <QSound> +#endif + #ifdef COMPILE_PHONON_SUPPORT #include <phonon/mediaobject.h> @@ -238,13 +243,13 @@ void KviSoundPlayer::detectSoundSystem() #endif KVI_OPTION_STRING(KviOption_stringSoundSystem) = "oss"; #endif - +#if (QT_VERSION < 0x050000) if(QSound::isAvailable()) { KVI_OPTION_STRING(KviOption_stringSoundSystem) = "qt"; return; } - +#endif KVI_OPTION_STRING(KviOption_stringSoundSystem) = "null"; #endif } @@ -359,7 +364,9 @@ bool KviSoundPlayer::playQt(const QString &szFileName) { if(isMuted()) return true; +#if (QT_VERSION < 0x050000) QSound::play(szFileName); +#endif return true; } @@ -859,6 +866,3 @@ KVIRC_MODULE( 0 ) -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "libkvisnd.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES |