Merge branch 'devel' of github.com:pixlra/playuver into devel

This commit is contained in:
jfmcarreira committed 2014-12-12 15:36:33 +00:00
commit a2f7f33699
1 file changed
+3 -3
+3 -3
View File
@@ -48,7 +48,7 @@ ADD_FEATURE_INFO(WErrors PLAYUVER_WERROR "Warnings as errors" )
IF( USE_QT4 )
SET( DEPENDENCIES_STRING "${DEPENDENCIES_STRING}QT4" )
FIND_PACKAGE( Qt4 REQUIRED COMPONENTS QtCore QtGui QtPrintSupport QtDBus QtNetwork QtWebKit )
FIND_PACKAGE( Qt4 REQUIRED COMPONENTS QtCore QtGui QtDBus QtNetwork QtWebKit )
SET( USE_QTDBUS TRUE )
@@ -65,11 +65,11 @@ IF( NOT USE_QT4 )
SET( DEPENDENCIES_STRING "${DEPENDENCIES_STRING}QT5" )
FIND_PACKAGE( Qt5 REQUIRED COMPONENTS Core Gui Widgets PrintSupport )
FIND_PACKAGE( Qt5 REQUIRED COMPONENTS Core Gui Widgets )
FIND_PACKAGE( Qt5DBus )
LIST(APPEND QT_LINKER_LIBS Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport )
LIST(APPEND QT_LINKER_LIBS Qt5::Core Qt5::Gui Qt5::Widgets )
LIST(APPEND QT_MODULES Core Gui Widgets )
IF( ${Qt5DBus_FOUND} )
SET( USE_QTDBUS ${Qt5DBus_FOUND} )