[PATCH 1/9] Remove remnants of old dbus code.

[Jon Severinsson]

---
 CMakeLists.txt                 |    5 -----
 cmake/FindPhononInternal.cmake |    7 -------
 phonon.pc.cmake                |    2 +-
 3 filer ändrade, 1 tillägg(+), 13 borttagningar(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af36f50..2cb6db5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,6 @@ message("-- !!!!! Tests have been removed and need to be redone !!!!!")
 #option(PHONON_BUILD_TESTS "Build the tests" OFF)
 
 option(PHONON_NO_CAPTURE "Disable the capture capabilities")
-option(PHONON_NO_DBUS "Deactivate DBus support (used to expose AudioOutputs and for deprecated runtime backend switching)" OFF)
 
 if (PHONON_ASSERT_STATES)
     message(STATUS "Enabling backend state machine validation.")
@@ -55,10 +54,6 @@ include_directories(${QT_INCLUDES}
 
 # Convenience variable to hold target link libraries we always need.
 set(PHONON_LIBS phonon ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-if(QT_QTDBUS_FOUND)
-    list(APPEND PHONON_LIBS phonon ${QT_QTDBUS_LIBRARY})
-endif(QT_QTDBUS_FOUND)
-
 
 # helper macro to make the install paths absolute
 macro(MAKE_ABS_INSTALL_PATH _absVar _path)
diff --git a/cmake/FindPhononInternal.cmake b/cmake/FindPhononInternal.cmake
index 66b4a21..1d472e4 100644
--- a/cmake/FindPhononInternal.cmake
+++ b/cmake/FindPhononInternal.cmake
@@ -67,11 +67,6 @@ endif (${QT_MIN_VERSION} VERSION_LESS "4.6.0")
 
 find_package(Qt4 ${_REQ_STRING_KDE4})
 
-# TODO: do we want this here?
-if (NOT QT_QTDBUS_FOUND)
-   message(WARNING "Building without DBus support as QtDBus was not found.")
-endif(NOT QT_QTDBUS_FOUND)
-
 # - Automoc
 
 # Starting with CMake 2.8.6 there is a builtin to replace automoc4, use that when possible.
@@ -111,8 +106,6 @@ set(LIB_INSTALL_DIR             "lib${LIB_SUFFIX}" ) #  CACHE PATH "The subdirec
 set(PLUGIN_INSTALL_DIR          "${LIB_INSTALL_DIR}/kde4"                   CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)")
 set(ICON_INSTALL_DIR            "${SHARE_INSTALL_PREFIX}/icons"             CACHE PATH "The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)")
 set(SERVICES_INSTALL_DIR        "${SHARE_INSTALL_PREFIX}/kde4/services"     CACHE PATH "The install dir for service (desktop, protocol, ...) files")
-set(DBUS_INTERFACES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/interfaces" CACHE PATH "The dbus interfaces install dir (default: ${SHARE_INSTALL_PREFIX}/dbus-1/interfaces)")
-set(DBUS_SERVICES_INSTALL_DIR   "${SHARE_INSTALL_PREFIX}/dbus-1/services"   CACHE PATH "The dbus services install dir (default: ${SHARE_INSTALL_PREFIX}/dbus-1/services)")
 
 set(INSTALL_TARGETS_DEFAULT_ARGS RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
                                  LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
diff --git a/phonon.pc.cmake b/phonon.pc.cmake
index 7234643..9c64cfc 100644
--- a/phonon.pc.cmake
+++ b/phonon.pc.cmake
@@ -7,6 +7,6 @@ buildsystemdir=@ABS_BUILDSYSTEM_INSTALL_DIR@
 Name: Phonon
 Description: Phonon library needed to build applications
 Version: @PHONON_LIB_MAJOR_VERSION at .@PHONON_LIB_MINOR_VERSION at .@PHONON_LIB_PATCH_VERSION@
-Requires: QtCore QtGui QtDBus
+Requires: QtCore QtGui
 Libs: -L${libdir} -lphonon
 Cflags: -I${includedir}
-- 
1.7.10.4

_______________________________________________
Kde-frameworks-devel mailing list
Kde-frameworks-devel at kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel