Fix build on Jenkins (or with BUILD_TESTING=ON)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4637e09d06fdcb5f8c2c977dbe6b0a46e16967e4..ea21f1af251d02294c2f0251e8cc0c71f32322af 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -129,6 +129,7 @@ install(TARGETS dolphinprivate ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
 set(dolphinpart_SRCS
    dolphinpart.cpp
    dolphinpart_ext.cpp
+   dolphindebug.cpp
 )
 
 add_library(dolphinpart MODULE ${dolphinpart_SRCS})
@@ -202,6 +203,7 @@ set(dolphin_SRCS
     statusbar/spaceinfoobserver.cpp
     statusbar/statusbarspaceinfo.cpp
     views/zoomlevelinfo.cpp
+    dolphindebug.cpp
 )
 
 kconfig_add_kcfg_files(dolphin_SRCS GENERATE_MOC

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 2679ac3dff0708a122995ae17f7966c7e5073dbc..35f328be55453afe926e97457359c1c18bef97c9 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -138,7 +138,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
         connect(lister, &KDirLister::newItems, notifyExt, &DolphinPartListingNotificationExtension::slotNewItems);
         connect(lister, &KDirLister::itemsDeleted, notifyExt, &DolphinPartListingNotificationExtension::slotItemsDeleted);
     } else {
-        // qCWarning(DolphinDebug) << "NULL KDirLister object! KParts::ListingNotificationExtension will NOT be supported";
+        qCWarning(DolphinDebug) << "NULL KDirLister object! KParts::ListingNotificationExtension will NOT be supported";
     }
 
     createActions();
@@ -340,7 +340,7 @@ void DolphinPart::slotMessage(const QString& msg)
 
 void DolphinPart::slotErrorMessage(const QString& msg)
 {
-    // qCDebug(DolphinDebug) << msg;
+    qCDebug(DolphinDebug) << msg;
     emit canceled(msg);
     //KMessageBox::error(m_view, msg);
 }
@@ -471,7 +471,7 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos,
 
 void DolphinPart::slotDirectoryRedirection(const QUrl &oldUrl, const QUrl &newUrl)
 {
-    // qCDebug(DolphinDebug) << oldUrl << newUrl << "currentUrl=" << url();
+    qCDebug(DolphinDebug) << oldUrl << newUrl << "currentUrl=" << url();
     if (oldUrl.matches(url(), QUrl::StripTrailingSlash /* #207572 */)) {
         KParts::ReadOnlyPart::setUrl(newUrl);
         const QString prettyUrl = newUrl.toDisplayString(QUrl::PreferLocalFile);

diff --git a/src/main.cpp b/src/main.cpp
index 3c9dd61305d29123bf63bcccb6dc1a3e7013291d..b8eb9a556ceeb1c0349141765f39260ba2ba60fa 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -109,7 +109,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
         if (url.isValid()) {
             urls.append(url);
         } else {
-            // qCWarning(DolphinDebug) << "Invalid URL: " << str;
+            qCWarning(DolphinDebug) << "Invalid URL: " << str;
         }
     }
 
@@ -152,7 +152,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
         if (className == QLatin1String("DolphinMainWindow")) {
             m_mainWindow->restore(1);
         } else {
-           // qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
+           qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
         }
     }
 

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index fe9665d1142872c2a94015e06e83d955ab62c9f7..1c6c5b40c33d701d3f6e40b0fb2e0541b51f5988 100644 (file)
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -56,6 +56,7 @@ set(kitemlistcontrollertest_SRCS
     ../kitemviews/kitemset.cpp
     ../kitemviews/kstandarditemlistview.cpp
     ../kitemviews/kstandarditemlistwidget.cpp
+    ../dolphindebug.cpp
 )
 
 kconfig_add_kcfg_files(kitemlistcontrollertest_SRCS GENERATE_MOC
@@ -81,6 +82,7 @@ set(kfileitemlistviewtest_SRCS
     ../kitemviews/kitemset.cpp
     ../kitemviews/kstandarditemlistview.cpp
     ../kitemviews/kstandarditemlistwidget.cpp
+    ../dolphindebug.cpp
 )
 
 kconfig_add_kcfg_files(kfileitemlistviewtest_SRCS GENERATE_MOC
@@ -99,6 +101,7 @@ set(kfileitemmodeltest_SRCS
     ../kitemviews/kfileitemmodel.cpp
     ../kitemviews/kitemmodelbase.cpp
     ../kitemviews/kitemset.cpp
+    ../dolphindebug.cpp
 )
 
 kconfig_add_kcfg_files(kfileitemmodeltest_SRCS GENERATE_MOC
@@ -116,6 +119,7 @@ set(kfileitemmodelbenchmark_SRCS
     testdir.cpp
     ../kitemviews/kfileitemmodel.cpp
     ../kitemviews/kitemmodelbase.cpp
+    ../dolphindebug.cpp
 )
 
 kconfig_add_kcfg_files(kfileitemmodelbenchmark_SRCS GENERATE_MOC
@@ -160,6 +164,7 @@ set(kstandarditemmodeltest_SRCS
     ../kitemviews/kstandarditem.cpp
     ../kitemviews/kstandarditemmodel.cpp
     ../kitemviews/kitemmodelbase.cpp
+    ../dolphindebug.cpp
 )
 
 add_executable(kstandarditemmodeltest ${kstandarditemmodeltest_SRCS})
@@ -172,6 +177,7 @@ set(viewpropertiestest_SRCS
     viewpropertiestest.cpp
     testdir.cpp
     ../views/viewproperties.cpp
+    ../dolphindebug.cpp
 )
 kconfig_add_kcfg_files(viewpropertiestest_SRCS GENERATE_MOC
   ../settings/dolphin_generalsettings.kcfgc

diff --git a/src/tests/kstandarditemmodeltest.cpp b/src/tests/kstandarditemmodeltest.cpp
index ea65cc4ce654fe0d49bce7dcc7d387b692113476..93aaf36866eecc8d63d54f3cd3ae2cdabb0e2d33 100644 (file)
--- a/src/tests/kstandarditemmodeltest.cpp
+++ b/src/tests/kstandarditemmodeltest.cpp
@@ -18,6 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
+#include "dolphindebug.h"
+
 #include "kitemviews/kstandarditem.h"
 #include "kitemviews/kstandarditemmodel.h"