libbluedevil port to Qt5

libbluedevil-qt5.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5509d61..f494fe2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,14 @@
 project(libbluedevil)
 
-cmake_minimum_required(VERSION 2.6.4)
+cmake_minimum_required(VERSION 2.8.11)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
 
-find_package(Qt4 REQUIRED)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+
+find_package(Qt5 CONFIG REQUIRED COMPONENTS
+    Core
+    DBus)
 
 include(CheckCXXCompilerFlag)
 
diff --git a/bluedevil/CMakeLists.txt b/bluedevil/CMakeLists.txt
index d3ac5fd..674890f 100644
--- a/bluedevil/CMakeLists.txt
+++ b/bluedevil/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(test)
 
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES})
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 set(libbluedevil_SRCS
     bluedevilmanager.cpp
@@ -12,19 +12,19 @@ set(libbluedevil_SRCS
 
 set(dbusobjectmanager_xml ${CMAKE_CURRENT_SOURCE_DIR}/bluez/org.freedesktop.DBus.ObjectManager.xml)
 set_source_files_properties(${dbusobjectmanager_xml} PROPERTIES INCLUDE "bluedevil/bluedevildbustypes.h")
-QT4_ADD_DBUS_INTERFACE(libbluedevil_SRCS ${dbusobjectmanager_xml} dbusobjectmanager)
+QT5_ADD_DBUS_INTERFACE(libbluedevil_SRCS ${dbusobjectmanager_xml} dbusobjectmanager)
 
-QT4_ADD_DBUS_INTERFACE(libbluedevil_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/bluez/org.freedesktop.DBus.Properties.xml dbusproperties)
+QT5_ADD_DBUS_INTERFACE(libbluedevil_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/bluez/org.freedesktop.DBus.Properties.xml dbusproperties)
 
-QT4_ADD_DBUS_INTERFACE(libbluedevil_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/bluez/org.bluez.Adapter1.xml bluezadapter1)
-QT4_ADD_DBUS_INTERFACE(libbluedevil_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/bluez/org.bluez.AgentManager1.xml bluezagentmanager1)
-QT4_ADD_DBUS_INTERFACE(libbluedevil_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/bluez/org.bluez.Device1.xml bluezdevice1)
-
-QT4_AUTOMOC(${libbluedevil_SRCS})
+QT5_ADD_DBUS_INTERFACE(libbluedevil_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/bluez/org.bluez.Adapter1.xml bluezadapter1)
+QT5_ADD_DBUS_INTERFACE(libbluedevil_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/bluez/org.bluez.AgentManager1.xml bluezagentmanager1)
+QT5_ADD_DBUS_INTERFACE(libbluedevil_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/bluez/org.bluez.Device1.xml bluezdevice1)
 
 add_library(bluedevil SHARED ${libbluedevil_SRCS})
 
-target_link_libraries(bluedevil ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY})
+target_link_libraries(bluedevil
+    Qt5::Core
+    Qt5::DBus)
 
 set_target_properties(bluedevil PROPERTIES
    VERSION ${GENERIC_LIB_VERSION}
diff --git a/bluedevil/bluedeviladapter.cpp b/bluedevil/bluedeviladapter.cpp
index 668934a..c19f35a 100644
--- a/bluedevil/bluedeviladapter.cpp
+++ b/bluedevil/bluedeviladapter.cpp
@@ -293,4 +293,4 @@ void Adapter::removeDevice(const QString &objectPath)
 
 }
 
-#include "bluedeviladapter.moc"
+#include "moc_bluedeviladapter.cpp"
diff --git a/bluedevil/bluedevildevice.cpp b/bluedevil/bluedevildevice.cpp
index 884d015..3b214d5 100644
--- a/bluedevil/bluedevildevice.cpp
+++ b/bluedevil/bluedevildevice.cpp
@@ -285,4 +285,4 @@ void Device::connectDevice()
 
 }
 
-#include "bluedevildevice.moc"
+#include "moc_bluedevildevice.cpp"
diff --git a/bluedevil/bluedevilmanager.cpp b/bluedevil/bluedevilmanager.cpp
index e5848be..a76b9b8 100644
--- a/bluedevil/bluedevilmanager.cpp
+++ b/bluedevil/bluedevilmanager.cpp
@@ -162,4 +162,4 @@ bool Manager::isBluetoothOperational() const
 
 }
 
-#include "bluedevilmanager.moc"
+#include "moc_bluedevilmanager.cpp"
diff --git a/bluedevil/bluedevilmanager_p.cpp b/bluedevil/bluedevilmanager_p.cpp
index ad32470..64558ac 100644
--- a/bluedevil/bluedevilmanager_p.cpp
+++ b/bluedevil/bluedevilmanager_p.cpp
@@ -207,4 +207,4 @@ void ManagerPrivate::_k_bluezAdapterPoweredChanged(bool powered)
 
 }
 
-#include "bluedevilmanager_p.moc"
\ No newline at end of file
+#include "moc_bluedevilmanager_p.cpp"
diff --git a/bluedevil/test/CMakeLists.txt b/bluedevil/test/CMakeLists.txt
index 8f12785..2894c0a 100644
--- a/bluedevil/test/CMakeLists.txt
+++ b/bluedevil/test/CMakeLists.txt
@@ -1,11 +1,15 @@
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES})
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 set (bluedeviltest_SRCS bluedeviltest.cpp)
-qt4_automoc(${bluedeviltest_SRCS})
 add_executable(bluedeviltest ${bluedeviltest_SRCS})
-target_link_libraries(bluedeviltest ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} bluedevil)
+target_link_libraries(bluedeviltest
+    Qt5::Core
+    Qt5::DBus
+    bluedevil)
 
 set (adaptertest_SRCS adaptertest.cpp)
-qt4_automoc(${adaptertest_SRCS})
 add_executable(adaptertest ${adaptertest_SRCS})
-target_link_libraries(adaptertest ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} bluedevil)
+target_link_libraries(adaptertest
+    Qt5::Core
+    Qt5::DBus
+    bluedevil)