From d81fe4794542d78dfaa503936e329e3520eeb18c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <bjorn@lindeijer.nl>
Date: Thu, 1 Apr 2021 10:30:37 +0200
Subject: [PATCH] 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.
---
 snap/snapcraft.yaml           | 1 -
 src/libtiled/libtiled-src.pri | 1 -
 src/tiled/tiled.pro           | 5 +++++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index c93c07afc1..56752d2ca6 100644
--- 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
index b45041408d..1cffe5ede1 100644
--- 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
index ce4ac1262b..6b76ed7560 100644
--- 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 \