From 2ca0e0eff204214187f47612c6badf4de15c894d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= <sebas@kde.org>
Date: Sat, 5 Oct 2013 04:30:19 +0200
Subject: [PATCH] find KDELibs4

---
 src/declarativeimports/qtextracomponents/CMakeLists.txt   | 3 +--
 src/declarativeimports/qtextracomponents/qiconitem.cpp    | 4 ++--
 .../qtextracomponents/tests/CMakeLists.txt                | 3 +--
 src/plasma/CMakeLists.txt                                 | 4 ++--
 src/plasma/private/theme_p.cpp                            | 8 ++++----
 src/plasma/svg.cpp                                        | 8 ++++----
 src/plasma/tests/kplugins/main.cpp                        | 2 +-
 src/plasma/tests/kplugins/plugintest.cpp                  | 4 ++--
 8 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/declarativeimports/qtextracomponents/CMakeLists.txt b/src/declarativeimports/qtextracomponents/CMakeLists.txt
index 4a97bb13f..a5dd27eaa 100644
--- a/src/declarativeimports/qtextracomponents/CMakeLists.txt
+++ b/src/declarativeimports/qtextracomponents/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(qtextracomponents)
 
-add_subdirectory(tests)
+#add_subdirectory(tests)
 
 set(qtextracomponents_SRCS
     qtextracomponentsplugin.cpp
@@ -14,7 +14,6 @@ set(qtextracomponents_SRCS
 INCLUDE_DIRECTORIES(
         ${CMAKE_SOURCE_DIR}
         ${CMAKE_BINARY_DIR}
-        ${KDE4_INCLUDES}
 )
 
 add_library(qtextracomponentsplugin SHARED ${qtextracomponents_SRCS})
diff --git a/src/declarativeimports/qtextracomponents/qiconitem.cpp b/src/declarativeimports/qtextracomponents/qiconitem.cpp
index 533f84d98..93b32d35d 100644
--- a/src/declarativeimports/qtextracomponents/qiconitem.cpp
+++ b/src/declarativeimports/qtextracomponents/qiconitem.cpp
@@ -19,8 +19,8 @@
 
 #include "qiconitem.h"
 
-#include <KIconLoader>
-#include <KIconEffect>
+#include <kiconloader.h>
+#include <kiconeffect.h>
 
 #include <QIcon>
 #include <QPainter>
diff --git a/src/declarativeimports/qtextracomponents/tests/CMakeLists.txt b/src/declarativeimports/qtextracomponents/tests/CMakeLists.txt
index 8c296516c..4595d18a8 100644
--- a/src/declarativeimports/qtextracomponents/tests/CMakeLists.txt
+++ b/src/declarativeimports/qtextracomponents/tests/CMakeLists.txt
@@ -8,8 +8,7 @@ target_link_libraries(fullmodelaccesstest
     ${QT_QTGUI_LIBRARY}
     ${QT_QTTEST_LIBRARY}
     ${KCore_LIBRARIES}
-    ${KDE4Support_LIBRARIES}
-
+    #${KDE4Support_LIBRARIES}
     KF5::KI18n
     )
 
diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt
index 80eafe725..b21fd7bc7 100644
--- a/src/plasma/CMakeLists.txt
+++ b/src/plasma/CMakeLists.txt
@@ -155,7 +155,7 @@ target_link_libraries(plasma
     KF5::KDE4Attic
     Qt5::UiTools
     ${KDE4Attic_LIBRARIES}
-    ${KDE4Support_LIBRARIES} # needed for KStandardDirs and KGlobal
+    #${KDE4Support_LIBRARIES} # needed for KStandardDirs and KGlobal
 )
 #FIXME gpgme++ is in kdepimlibs, needs to be elsewhere
 target_link_libraries(plasma KF5::KDeclarative KF5::KArchive)
@@ -168,7 +168,7 @@ if(DL_LIBRARY)
     target_link_libraries(plasma ${DL_LIBRARY})
 endif(DL_LIBRARY)
 
-target_link_libraries(plasma LINK_INTERFACE_LIBRARIES ${KCore_LIBRARIES} Qt5::Widgets)
+target_link_libraries(plasma LINK_INTERFACE_LIBRARIES Qt5::Widgets KF5::KConfigWidgets)
 
 #do NOT use GENERIC versioning -- the plasma team will take care of versioning
 set_target_properties(plasma PROPERTIES
diff --git a/src/plasma/private/theme_p.cpp b/src/plasma/private/theme_p.cpp
index f433c08a4..e26089b48 100644
--- a/src/plasma/private/theme_p.cpp
+++ b/src/plasma/private/theme_p.cpp
@@ -539,11 +539,11 @@ void ThemePrivate::setThemeName(const QString &tempThemeName, bool writeSettings
 
     if (colorsFile.isEmpty()) {
         colors = 0;
-        QObject::connect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()),
-                         this, SLOT(colorsChanged()), Qt::UniqueConnection);
+//         QObject::connect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()),
+//                          this, SLOT(colorsChanged()), Qt::UniqueConnection);
     } else {
-        QObject::disconnect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()),
-                            this, SLOT(colorsChanged()));
+//         QObject::disconnect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()),
+//                             this, SLOT(colorsChanged()));
         colors = KSharedConfig::openConfig(colorsFile);
     }
 
diff --git a/src/plasma/svg.cpp b/src/plasma/svg.cpp
index 72689b350..c0123d1ed 100644
--- a/src/plasma/svg.cpp
+++ b/src/plasma/svg.cpp
@@ -547,11 +547,11 @@ void SvgPrivate::checkColorHints()
     // check to see if we are using colors, but the theme isn't being used or isn't providing
     // a colorscheme
     if (usesColors && (!themed || !actualTheme()->colorScheme())) {
-        QObject::connect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()),
-                         q, SLOT(colorsChanged()), Qt::UniqueConnection);
+//         QObject::connect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()),
+//                          q, SLOT(colorsChanged()), Qt::UniqueConnection);
     } else {
-        QObject::disconnect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()),
-                            q, SLOT(colorsChanged()));
+//         QObject::disconnect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()),
+//                             q, SLOT(colorsChanged()));
     }
 }
 
diff --git a/src/plasma/tests/kplugins/main.cpp b/src/plasma/tests/kplugins/main.cpp
index a65c20719..421e3fb30 100644
--- a/src/plasma/tests/kplugins/main.cpp
+++ b/src/plasma/tests/kplugins/main.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <KLocalizedString>
+#include <klocalizedstring.h>
 #include <qcommandlineparser.h>
 #include <qcommandlineoption.h>
 
diff --git a/src/plasma/tests/kplugins/plugintest.cpp b/src/plasma/tests/kplugins/plugintest.cpp
index 4682e9674..8f3f84663 100644
--- a/src/plasma/tests/kplugins/plugintest.cpp
+++ b/src/plasma/tests/kplugins/plugintest.cpp
@@ -25,7 +25,7 @@
 #include <kservice.h>
 #include <kservicetypetrader.h>
 #include <kshell.h>
-#include <KSycoca>
+#include <ksycoca.h>
 #include <klocalizedstring.h>
 
 #include <plasma/applet.h>
@@ -33,7 +33,7 @@
 #include <plasma/package.h>
 #include <plasma/pluginloader.h>
 #include <plasma/dataengine.h>
-#include <KGlobal>
+#include <kglobal.h>
 #include <klocale.h>
 #include <kjob.h>