File kdelibs-solid_qt_no_debug_output.patch of Package kdelibs

File kdelibs-solid_qt_no_debug_output.patch of Package kdelibs (Revision 3)

Currently displaying revision 3 , Show latest

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
--- kdelibs-4.9.90/solid/solid/backends/hal/halstorageaccess.cpp.solid_qt_no_debug_output	2012-11-14 09:58:29.000000000 -0600
+++ kdelibs-4.9.90/solid/solid/backends/hal/halstorageaccess.cpp	2012-12-12 16:18:25.817495558 -0600
@@ -340,9 +340,11 @@ bool StorageAccess::requestPassphrase()
                                                 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.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp.solid_qt_no_debug_output kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp
--- kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp.solid_qt_no_debug_output	2012-11-14 09:58:29.000000000 -0600
+++ kdelibs-4.9.90/solid/solid/backends/udisks2/udisksstorageaccess.cpp	2012-12-12 16:17:36.922022895 -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.90/solid/solid/CMakeLists.txt.solid_qt_no_debug_output kdelibs-4.9.90/solid/solid/CMakeLists.txt
--- kdelibs-4.9.90/solid/solid/CMakeLists.txt.solid_qt_no_debug_output	2012-11-14 09:58:29.000000000 -0600
+++ kdelibs-4.9.90/solid/solid/CMakeLists.txt	2012-12-12 16:17:36.922022895 -0600
@@ -268,7 +268,7 @@ if(NOT WIN32 AND NOT APPLE)
 
        if ( WITH_SOLID_UDISKS2 )
            message(STATUS "Building Solid UDisks2 backend." )
-           add_definitions(-DWITH_SOLID_UDISKS2)
+           add_definitions(-DWITH_SOLID_UDISKS2 -DQT_NO_DEBUG_OUTPUT)
            set(solid_LIB_SRCS ${solid_LIB_SRCS}
            backends/udisks2/udisksmanager.cpp
            backends/udisks2/udisksdevice.cpp