From 99c5633a634693ebbcf0a2d0aadaff4c9055facb Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 4 Mar 2013 12:34:45 +0000 Subject: [PATCH] patch from Henry Morgan to unify compilation settings for VOIP git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6185 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- plugins/VOIP/VOIP.pro | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/plugins/VOIP/VOIP.pro b/plugins/VOIP/VOIP.pro index 7deabed0e..2b03f84bf 100644 --- a/plugins/VOIP/VOIP.pro +++ b/plugins/VOIP/VOIP.pro @@ -1,16 +1,15 @@ !include("../Common/retroshare_plugin.pri"): error("Could not include file ../Common/retroshare_plugin.pri") +exists($$[QMAKE_MKSPECS]/features/mobility.prf) { + CONFIG += mobility +} else { + QT += multimedia +} CONFIG += qt uic qrc resources -CONFIG += mobility 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) | win32 { - QT += multimedia +win32 { + QT *= multimedia } INCLUDEPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src