diff --git a/CMakeLists.txt b/CMakeLists.txt index b46bbdc35..d208ea282 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,6 +52,8 @@ endif() file(GLOB INTERFACES "interfaces/*.h") +add_compile_definitions(USE_AM) + #因为单元测试需要直接测试源代码,而主程序代码中include的单元使用了相对路径 #单元测试的CMakeLists和主程序的CMakeLists路径不同,编译单元测试时会提示找不到文件 #因此设置搜索路径 diff --git a/debian/rules b/debian/rules index a23c49052..9fbc0fdc0 100755 --- a/debian/rules +++ b/debian/rules @@ -12,5 +12,4 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) override_dh_auto_configure: dh_auto_configure -- \ - -DHOST_MULTIARCH="$(DEB_HOST_MULTIARCH)" \ - -DUSE_AM=YES + -DHOST_MULTIARCH="$(DEB_HOST_MULTIARCH)" diff --git a/frame/item/launcheritem.cpp b/frame/item/launcheritem.cpp index f482e3ad6..7e53e310f 100644 --- a/frame/item/launcheritem.cpp +++ b/frame/item/launcheritem.cpp @@ -100,11 +100,17 @@ void LauncherItem::mouseReleaseEvent(QMouseEvent *e) if (e->button() != Qt::LeftButton) return; +#ifdef USE_AM + DDBusSender dbusSender = DDBusSender() + .service("org.deepin.dde.Launcher1") + .path("/org/deepin/dde/Launcher1") + .interface("org.deepin.dde.Launcher1"); +#else DDBusSender dbusSender = DDBusSender() .service("com.deepin.dde.Launcher") .path("/com/deepin/dde/Launcher") .interface("com.deepin.dde.Launcher"); - +#endif QDBusPendingReply visibleReply = dbusSender.property("Visible").get(); if (!visibleReply.value()) dbusSender.method("Show").call();