mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-26 23:36:59 -05:00
patch from thunder to fixed compilation on windows
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5000 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
160a895c47
commit
c843a047ff
@ -4,6 +4,15 @@ CONFIG += qt uic qrc resources
|
|||||||
CONFIG += mobility
|
CONFIG += mobility
|
||||||
MOBILITY = multimedia
|
MOBILITY = multimedia
|
||||||
|
|
||||||
|
QT_VERSION = $$[QT_VERSION]
|
||||||
|
QT_VERSION = $$split(QT_VERSION, ".")
|
||||||
|
QT_VER_MAJ = $$member(QT_VERSION, 0)
|
||||||
|
QT_VER_MIN = $$member(QT_VERSION, 1)
|
||||||
|
|
||||||
|
lessThan(QT_VER_MAJ, 4) | lessThan(QT_VER_MIN, 7) {
|
||||||
|
QT += multimedia
|
||||||
|
}
|
||||||
|
|
||||||
INCLUDEPATH += ../../retroshare-gui/src/temp/ui
|
INCLUDEPATH += ../../retroshare-gui/src/temp/ui
|
||||||
|
|
||||||
QMAKE_CXXFLAGS *= -Wall
|
QMAKE_CXXFLAGS *= -Wall
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
|
#include <limits.h>
|
||||||
|
|
||||||
#include "interface/rsvoip.h"
|
#include "interface/rsvoip.h"
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#ifndef AUDIODEVICEHELPER_H
|
#ifndef AUDIODEVICEHELPER_H
|
||||||
#define AUDIODEVICEHELPER_H
|
#define AUDIODEVICEHELPER_H
|
||||||
#include <QtMultimediaKit/QAudioInput>
|
#include <QAudioInput>
|
||||||
#include <QtMultimediaKit/QAudioOutput>
|
#include <QAudioOutput>
|
||||||
|
|
||||||
class AudioDeviceHelper
|
class AudioDeviceHelper
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user