fix solid_qt_no_debug_output patch too
This commit is contained in:
parent
0005ac1ea0
commit
50500ac68f
|
@ -1,6 +1,21 @@
|
||||||
diff -up kdelibs-4.9.4/solid/solid/CMakeLists.txt.no_solid_spam kdelibs-4.9.4/solid/solid/CMakeLists.txt
|
diff -up kdelibs-4.9.4/solid/solid/backends/udisks2/udisksstorageaccess.cpp.solid_qt_no_debug_output kdelibs-4.9.4/solid/solid/backends/udisks2/udisksstorageaccess.cpp
|
||||||
--- kdelibs-4.9.4/solid/solid/CMakeLists.txt.no_solid_spam 2012-12-12 11:54:59.644811835 -0600
|
--- kdelibs-4.9.4/solid/solid/backends/udisks2/udisksstorageaccess.cpp.solid_qt_no_debug_output 2012-12-12 14:52:52.199346662 -0600
|
||||||
+++ kdelibs-4.9.4/solid/solid/CMakeLists.txt 2012-12-12 12:03:11.093451554 -0600
|
+++ kdelibs-4.9.4/solid/solid/backends/udisks2/udisksstorageaccess.cpp 2012-12-12 15:44:40.854085494 -0600
|
||||||
|
@@ -341,9 +341,10 @@ bool StorageAccess::requestPassphrase()
|
||||||
|
QDBusReply<void> reply = soliduiserver.call("showPassphraseDialog", udi, returnService,
|
||||||
|
m_lastReturnObject, wId, appId);
|
||||||
|
m_passphraseRequested = reply.isValid();
|
||||||
|
+#ifndef QT_NO_DEBUG_STREAM
|
||||||
|
if (!m_passphraseRequested)
|
||||||
|
qWarning() << "Failed to call the SolidUiServer, D-Bus said:" << reply.error();
|
||||||
|
-
|
||||||
|
+#endif
|
||||||
|
return m_passphraseRequested;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -up kdelibs-4.9.4/solid/solid/CMakeLists.txt.solid_qt_no_debug_output kdelibs-4.9.4/solid/solid/CMakeLists.txt
|
||||||
|
--- kdelibs-4.9.4/solid/solid/CMakeLists.txt.solid_qt_no_debug_output 2012-12-12 14:52:52.194346712 -0600
|
||||||
|
+++ kdelibs-4.9.4/solid/solid/CMakeLists.txt 2012-12-12 14:52:52.203346619 -0600
|
||||||
@@ -240,7 +240,7 @@ if(NOT WIN32 AND NOT APPLE)
|
@@ -240,7 +240,7 @@ if(NOT WIN32 AND NOT APPLE)
|
||||||
|
|
||||||
if ( WITH_SOLID_UDISKS2 )
|
if ( WITH_SOLID_UDISKS2 )
|
||||||
|
|
Loading…
Reference in New Issue