iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update solid-lite to KDE 4.10.1 - including (optional) support for UDisks2

Browse Source
This commit is contained in:
craig.p.drummond
2013-03-11 19:54:16 +00:00
parent f18b02ce47
commit 446b71ce3b
33 changed files with 3846 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
solid-lite/managerbase.cpp
View File

@@ -31,12 +31,16 @@
#include "backends/iokit/iokitmanager.h"
#elif defined (Q_OS_UNIX)
#include "backends/hal/halmanager.h"
#if defined (WITH_SOLID_UDISKS2)
#include "backends/udisks2/udisksmanager.h"
#else
#include "backends/udisks/udisksmanager.h"
#endif
//#include "backends/upower/upowermanager.h"
#if defined (HUPNP_FOUND)
#include "backends/upnp/upnpdevicemanager.h"
#endif
//#if defined (HUPNP_FOUND)
//#include "backends/upnp/upnpdevicemanager.h"
//#endif
#if defined (UDEV_FOUND)
#include "backends/udev/udevmanager.h"
@@ -83,7 +87,11 @@ void Solid::ManagerBasePrivate::loadBackends()
# if defined(UDEV_FOUND)
m_backends << new Solid::Backends::UDev::UDevManager(0);
# endif
# if defined(WITH_SOLID_UDISKS2)
m_backends << new Solid::Backends::UDisks2::Manager(0)
# else
m_backends << new Solid::Backends::UDisks::UDisksManager(0)
# endif
/*<< new Solid::Backends::UPower::UPowerManager(0)
<< new Solid::Backends::Fstab::FstabManager(0)*/;
}