|
 |
ece602d |
diff -up kdelibs-4.9.90/solid/solid/backends/hal/halstorageaccess.cpp.solid_qt_no_debug_output kdelibs-4.9.90/solid/solid/backends/hal/halstorageaccess.cpp
|
|
|
ece602d |
--- kdelibs-4.9.90/solid/solid/backends/hal/halstorageaccess.cpp.solid_qt_no_debug_output 2012-11-14 09:58:29.000000000 -0600
|
|
|
ece602d |
+++ kdelibs-4.9.90/solid/solid/backends/hal/halstorageaccess.cpp 2012-12-12 16:18:25.817495558 -0600
|
|
|
ece602d |
@@ -340,9 +340,11 @@ bool StorageAccess::requestPassphrase()
|
|
|
ece602d |
returnService, m_lastReturnObject,
|
|
|
ece602d |
wId, appId);
|
|
|
ece602d |
m_passphraseRequested = reply.isValid();
|
|
|
ece602d |
+#ifndef QT_NO_DEBUG_STREAM
|
|
|
ece602d |
if (!m_passphraseRequested) {
|
|
|
ece602d |
qWarning() << "Failed to call the SolidUiServer, D-Bus said:" << reply.error();
|
|
|
ece602d |
}
|
|
|
ece602d |
+#endif
|
|
|
ece602d |
return m_passphraseRequested;
|
|
|
ece602d |
}
|
|
|
ece602d |
|
|
|
ece602d |
diff -up kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp.solid_qt_no_debug_output kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp
|
|
|
ece602d |
--- kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp.solid_qt_no_debug_output 2012-11-14 09:58:29.000000000 -0600
|
|
|
ece602d |
+++ kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp 2012-12-12 16:17:36.922022895 -0600
|
|
|
50500ac |
@@ -341,9 +341,10 @@ bool StorageAccess::requestPassphrase()
|
|
|
50500ac |
QDBusReply<void> reply = soliduiserver.call("showPassphraseDialog", udi, returnService,
|
|
|
50500ac |
m_lastReturnObject, wId, appId);
|
|
|
50500ac |
m_passphraseRequested = reply.isValid();
|
|
|
50500ac |
+#ifndef QT_NO_DEBUG_STREAM
|
|
|
50500ac |
if (!m_passphraseRequested)
|
|
|
50500ac |
qWarning() << "Failed to call the SolidUiServer, D-Bus said:" << reply.error();
|
|
|
50500ac |
-
|
|
|
50500ac |
+#endif
|
|
|
50500ac |
return m_passphraseRequested;
|
|
|
50500ac |
}
|
|
|
50500ac |
|
|
|
ece602d |
diff -up kdelibs-4.9.90/solid/solid/CMakeLists.txt.solid_qt_no_debug_output kdelibs-4.9.90/solid/solid/CMakeLists.txt
|
|
|
ece602d |
--- kdelibs-4.9.90/solid/solid/CMakeLists.txt.solid_qt_no_debug_output 2012-11-14 09:58:29.000000000 -0600
|
|
|
ece602d |
+++ kdelibs-4.9.90/solid/solid/CMakeLists.txt 2012-12-12 16:17:36.922022895 -0600
|
|
|
ece602d |
@@ -268,7 +268,7 @@ if(NOT WIN32 AND NOT APPLE)
|
|
|
99e1e34 |
|
|
|
99e1e34 |
if ( WITH_SOLID_UDISKS2 )
|
|
|
99e1e34 |
message(STATUS "Building Solid UDisks2 backend." )
|
|
|
99e1e34 |
- add_definitions(-DWITH_SOLID_UDISKS2)
|
|
|
99e1e34 |
+ add_definitions(-DWITH_SOLID_UDISKS2 -DQT_NO_DEBUG_OUTPUT)
|
|
|
99e1e34 |
set(solid_LIB_SRCS ${solid_LIB_SRCS}
|
|
|
99e1e34 |
backends/udisks2/udisksmanager.cpp
|
|
|
99e1e34 |
backends/udisks2/udisksdevice.cpp
|