find KDELibs4

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})

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>

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
     )
 

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

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);
     }
 

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()));
     }
 }
 

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>
 

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>