blob: e74889e789ecf4df908f5bfaf5429b57b9de83f9 (
plain)
1 From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001
2 From: Chocobozzz <florian.chocobo@gmail.com>
3 Date: Wed, 16 Jul 2014 15:57:25 +0200
4 Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401
5
6 ---
7 src/CMakeLists.txt | 9 ++++-----
8 1 file changed, 4 insertions(+), 5 deletions(-)
9
10 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
11 index 650fa74..775b0a5 100644
12 --- a/src/CMakeLists.txt
13 +++ b/src/CMakeLists.txt
14 @@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)
15 if(HAVE_DBUS)
16 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
17
18 - # Hack to get it to generate interfaces without namespaces - required
19 - # because otherwise org::freedesktop::UDisks and
20 - # org::freedesktop::UDisks::Device conflict.
21 - list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N)
22 -
23 # MPRIS DBUS interfaces
24 qt4_add_dbus_adaptor(SOURCES
25 dbus/org.freedesktop.MediaPlayer.player.xml
26 @@ -964,6 +959,10 @@ if(HAVE_DBUS)
27
28 # DeviceKit DBUS interfaces
29 if(HAVE_DEVICEKIT)
30 + set_source_files_properties(dbus/org.freedesktop.UDisks.xml
31 + PROPERTIES NO_NAMESPACE dbus/udisks)
32 + set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml
33 + PROPERTIES NO_NAMESPACE dbus/udisksdevice)
34 qt4_add_dbus_interface(SOURCES
35 dbus/org.freedesktop.UDisks.xml
36 dbus/udisks)
37 --
38 2.0.3
|
