diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e7af7c..a1bddf6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,9 @@ 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 QtNetwork QtWebKit ) - FIND_PACKAGE( Qt4 COMPONENTS QtDBus ) + + SET( USE_QTDBUS FALSE ) + IF( NOT QT4_FOUND ) SET(USE_QT4 FALSE) ELSE() @@ -64,7 +66,7 @@ IF( NOT USE_QT4 ) SET( DEPENDENCIES_STRING "${DEPENDENCIES_STRING}QT5" ) FIND_PACKAGE( Qt5 REQUIRED COMPONENTS Core Gui Widgets ) -# # FIND_PACKAGE( Qt5 COMPONENTS DBus ) +# FIND_PACKAGE( Qt5 COMPONENTS DBus ) LIST(APPEND QT_LINKER_LIBS Qt5::Core Qt5::Gui Qt5::Widgets ) diff --git a/app/plaYUVerApp.cpp b/app/plaYUVerApp.cpp index 933ca2e..0a51794 100644 --- a/app/plaYUVerApp.cpp +++ b/app/plaYUVerApp.cpp @@ -27,10 +27,6 @@ #ifdef USE_FERVOR #include "fvupdater.h" #endif -#ifdef USE_QTDBUS -#include "PlaYUVerAppAdaptor.h" -#endif - #include "plaYUVerApp.h" #include "DialogSubWindowSelector.h" #include "WidgetFrameNumber.h" diff --git a/app/plaYUVerApp.h b/app/plaYUVerApp.h index 487ab7b..9d80e1f 100644 --- a/app/plaYUVerApp.h +++ b/app/plaYUVerApp.h @@ -31,6 +31,9 @@ #elif( QT_VERSION_PLAYUVER == 4 ) #include #endif +#ifdef USE_QTDBUS +#include "PlaYUVerAppAdaptor.h" +#endif #include #include "lib/PlaYUVerDefs.h" #include "SubWindowHandle.h" diff --git a/cmake/Win32.cmake b/cmake/Win32.cmake index 4f16659..e15a435 100644 --- a/cmake/Win32.cmake +++ b/cmake/Win32.cmake @@ -2,6 +2,8 @@ # DLLs and Win32 specific code ###################################################################################### +SET( USE_QTDBUS FALSE ) + foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} ) string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG ) set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "." )