snap: Try alternative fix for getting DBUS to work

The 'dbus' snap plug appears to have a different purpose, and causes the following warning: snap "tiled" has bad plugs or slots: dbus (cannot find attribute 'bus') Instead, the reason DBUS communication didn't work for the snap was that the snap is built with qmake and the qmake project wasn't enabling DBUS yet. Also removed a reference to the no longer existing 'terrain.h' from the qmake project.
mapeditor · Apr 1, 2021 · d81fe47 · d81fe47
1 parent 6ec80a4
commit d81fe47
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -20,7 +20,6 @@ apps:
       - removable-media
       - opengl
       - network
-      - dbus
   tmxviewer:
     command: desktop-launch ${SNAP}/usr/bin/tmxviewer
     plugs:

diff --git a/src/libtiled/libtiled-src.pri b/src/libtiled/libtiled-src.pri
@@ -78,7 +78,6 @@ HEADERS += $$PWD/compression.h \
     $$PWD/savefile.h \
     $$PWD/staggeredrenderer.h \
     $$PWD/templatemanager.h \
-    $$PWD/terrain.h \
     $$PWD/tile.h \
     $$PWD/tileanimationdriver.h \
     $$PWD/tiled.h \

diff --git a/src/tiled/tiled.pro b/src/tiled/tiled.pro
@@ -19,6 +19,11 @@ contains(QT_CONFIG, opengl):minQtVersion(6, 0, 0) {
     QT += openglwidgets
 }
 
+contains(QT_CONFIG, dbus) {
+    QT += dbus
+    DEFINES += TILED_ENABLE_DBUS
+}
+
 DEFINES += TILED_VERSION=$${TILED_VERSION}
 
 DEFINES += QT_NO_CAST_FROM_ASCII \
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,6 @@ apps: @@
           - removable-media
           - opengl
           - network
-          - dbus
       tmxviewer:
         command: desktop-launch ${SNAP}/usr/bin/tmxviewer
         plugs:
@@ Expand Down @@