dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compile without dbus

Browse Source
This commit is contained in:
Jonas Kvinge
2018-07-03 21:21:33 +02:00
parent c818ce19e9
commit a554032823
8 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/device/devicemanager.cpp
View File

@@ -60,7 +60,6 @@
#include "connecteddevice.h"
#include "devicelister.h"
#include "devicedatabasebackend.h"
#include "devicekitlister.h"
#include "devicestatefiltermodel.h"
#if defined(HAVE_AUDIOCD) && defined(HAVE_GSTREAMER)
@@ -84,8 +83,13 @@
#ifdef HAVE_LIBMTP
# include "mtpdevice.h"
#endif
#ifdef HAVE_UDISKS2
# include "udisks2lister.h"
#ifdef HAVE_DBUS
# ifdef HAVE_DEVICEKIT
# include "devicekitlister.h"
# endif
# ifdef HAVE_UDISKS2
# include "udisks2lister.h"
# endif
#endif
using std::bind;
@@ -219,14 +223,14 @@ DeviceManager::DeviceManager(Application *app, QObject *parent)
connected_devices_model_ = new DeviceStateFilterModel(this);
connected_devices_model_->setSourceModel(this);
// CD devices are detected via the DiskArbitration framework instead on Darwin.
// CD devices are detected via the DiskArbitration framework instead on MacOs.
#if defined(HAVE_AUDIOCD) && defined(HAVE_GSTREAMER) && !defined(Q_OS_MACOS)
AddLister(new CddaLister);
#endif
#ifdef HAVE_DEVICEKIT
#if defined(HAVE_DBUS) && defined(HAVE_DEVICEKIT)
AddLister(new DeviceKitLister);
#endif
#ifdef HAVE_UDISKS2
#if defined(HAVE_DBUS) && defined(HAVE_UDISKS2)
AddLister(new Udisks2Lister);
#endif
#ifdef HAVE_GIO