31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
|
diff -up kdelibs-4.8.2/solid/solid/managerbase.cpp.udisks2_prep kdelibs-4.8.2/solid/solid/managerbase.cpp
|
||
|
|
--- kdelibs-4.8.2/solid/solid/managerbase.cpp.udisks2_prep 2011-07-27 13:34:39.000000000 -0500
|
||
|
|
+++ kdelibs-4.8.2/solid/solid/managerbase.cpp 2012-04-17 15:05:09.786696443 -0500
|
||
|
|
@@ -21,7 +21,7 @@
|
||
|
|
#include "managerbase_p.h"
|
||
|
|
|
||
|
|
#include <stdlib.h>
|
||
|
|
-#if !defined (Q_WS_WIN) && !defined (Q_OS_MAC)
|
||
|
|
+#if !defined (Q_OS_WIN) && !defined (Q_OS_MAC)
|
||
|
|
#include <config-solid.h>
|
||
|
|
#endif
|
||
|
|
|
||
|
|
@@ -44,7 +44,7 @@
|
||
|
|
|
||
|
|
#include "backends/fstab/fstabmanager.h"
|
||
|
|
|
||
|
|
-#elif defined (Q_WS_WIN) && defined(HAVE_WBEM) && !defined(_WIN32_WCE)
|
||
|
|
+#elif defined (Q_OS_WIN) && defined(HAVE_WBEM) && !defined(_WIN32_WCE)
|
||
|
|
#include "backends/wmi/wmimanager.h"
|
||
|
|
#endif
|
||
|
|
|
||
|
|
@@ -68,7 +68,7 @@ void Solid::ManagerBasePrivate::loadBack
|
||
|
|
# if defined(Q_OS_MAC)
|
||
|
|
m_backends << new Solid::Backends::IOKit::IOKitManager(0);
|
||
|
|
|
||
|
|
-# elif defined(Q_WS_WIN) && defined(HAVE_WBEM) && !defined(_WIN32_WCE)
|
||
|
|
+# elif defined(Q_OS_WIN) && defined(HAVE_WBEM) && !defined(_WIN32_WCE)
|
||
|
|
m_backends << new Solid::Backends::Wmi::WmiManager(0);
|
||
|
|
|
||
|
|
# elif defined(Q_OS_UNIX) && !defined(Q_OS_LINUX)
|