Skip to content

Commit d81fe47

Browse files
committed
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.
1 parent 6ec80a4 commit d81fe47

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

snap/snapcraft.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ apps:
2020
- removable-media
2121
- opengl
2222
- network
23-
- dbus
2423
tmxviewer:
2524
command: desktop-launch ${SNAP}/usr/bin/tmxviewer
2625
plugs:

src/libtiled/libtiled-src.pri

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ HEADERS += $$PWD/compression.h \
7878
$$PWD/savefile.h \
7979
$$PWD/staggeredrenderer.h \
8080
$$PWD/templatemanager.h \
81-
$$PWD/terrain.h \
8281
$$PWD/tile.h \
8382
$$PWD/tileanimationdriver.h \
8483
$$PWD/tiled.h \

src/tiled/tiled.pro

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ contains(QT_CONFIG, opengl):minQtVersion(6, 0, 0) {
1919
QT += openglwidgets
2020
}
2121

22+
contains(QT_CONFIG, dbus) {
23+
QT += dbus
24+
DEFINES += TILED_ENABLE_DBUS
25+
}
26+
2227
DEFINES += TILED_VERSION=$${TILED_VERSION}
2328

2429
DEFINES += QT_NO_CAST_FROM_ASCII \

0 commit comments

Comments
 (0)