feat(DRegion): add compatibility macro

Change-Id: I3bb30235c0c9adfafba331feb451ab38694cd8b2
linuxdeepin · Dec 27, 2017 · 49db18a · 49db18a
1 parent 367d843
commit 49db18a
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 4 deletions.
diff --git a/debian/rules b/debian/rules
@@ -3,11 +3,22 @@ DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 export QT_SELECT = qt5
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+version=$(shell dpkg-query --showformat='$${Version}' --show libdframeworkdbus-dev)
+COMPARE_VERSION=$(shell dpkg --compare-versions 0.4.2-1 ge-nl $(version); echo $$?)
+
 %:
 	dh $@ --parallel
 
+ifeq ($(COMPARE_VERSION), 1)
 override_dh_auto_configure:
 	dh_auto_configure -- LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+endif
+
+ifeq ($(COMPARE_VERSION), 0)
+override_dh_auto_configure:
+	dh_auto_configure -- LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) DBUS_VERSION_0_4_2=YES
+endif
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V
diff --git a/src/lib.pri b/src/lib.pri
@@ -18,6 +18,10 @@ isEmpty(INCLUDE_INSTALL_DIR) {
     DTK_INCLUDEPATH = $$INCLUDE_INSTALL_DIR/libdtk-$$VERSION
 }
 
+isEqual(DBUS_VERSION_0_4_2, YES) {
+    DEFINES += DBUS_VERSION_0_4_2
+}
+
 INSTALLS += includes target
 
 win32* {

diff --git a/src/util/dregionmonitor.cpp b/src/util/dregionmonitor.cpp
@@ -60,9 +60,12 @@ void DRegionMonitor::setWatchedRegion(const QRegion &region)
 }
 
 DRegionMonitorPrivate::DRegionMonitorPrivate(DRegionMonitor *q)
-    : DObjectPrivate(q),
-
-      eventInter(new XEventMonitor("com.deepin.api.XEventMonitor", "/com/deepin/api/XEventMonitor", QDBusConnection::sessionBus()))
+    : DObjectPrivate(q)
+#ifndef DBUS_VERSION_0_4_2
+    , eventInter(new XEventMonitor("com.deepin.api.XEventMonitor", "/com/deepin/api/XEventMonitor", QDBusConnection::sessionBus()))
+#else
+    , eventInter(new XMousAreaInter("com.deepin.api.XMouseArea", "/com/deepin/api/XMouseArea", QDBusConnection::sessionBus()))
+#endif
 {
 }
 

diff --git a/src/util/private/dregionmonitor_p.h b/src/util/private/dregionmonitor_p.h
@@ -8,12 +8,20 @@
 #include <QRegion>
 #include <QScreen>
 
+#ifndef DBUS_VERSION_0_4_2
 #include <com_deepin_api_xeventmonitor.h>
+#else
+#include <com_deepin_api_xmousearea.h>
+#endif
 
 DCORE_USE_NAMESPACE
 DWIDGET_BEGIN_NAMESPACE
 
-using XEventMonitor = com::deepin::api::XEventMonitor;
+#ifndef DBUS_VERSION_0_4_2
+using XEventMonitor = ::com::deepin::api::XEventMonitor;
+#else
+using XMousAreaInter = ::com::deepin::api::XMouseArea;
+#endif
 
 class DRegionMonitorPrivate : public DObjectPrivate
 {
@@ -43,7 +51,11 @@ class DRegionMonitorPrivate : public DObjectPrivate
 
     const QPoint deviceScaledCoordinate(const QPoint &p, const double ratio) const;
 
+#ifndef DBUS_VERSION_0_4_2
     XEventMonitor *eventInter;
+#else
+    XMousAreaInter *eventInter;
+#endif
     QRegion watchedRegion;
     QString registerKey;
 };