From d5d06e484e2d27ee91f8bd290fcaa5caccacbf3e Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Sun, 20 Mar 2022 12:06:02 +0100
Subject: [PATCH] Properly include KF includes

With https://invent.kde.org/frameworks/kwayland/-/merge_requests/52 we
can build without the 4 era legacy include paths for the first time, which
uncovered those.
---
 kcms/kfontinst/kcmfontinst/KCmFontInst.cpp          | 2 +-
 klipper/klipper.cpp                                 | 4 ++++
 runners/locations/autotests/locationsrunnertest.cpp | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/kcms/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcms/kfontinst/kcmfontinst/KCmFontInst.cpp
index de1254a73..5a32ca085 100644
--- a/kcms/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcms/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -23,7 +23,7 @@
 #include <KIconLoader>
 #include <KJobWidgets>
 #include <KMessageBox>
-#include <KNewStuff3/KNS3/QtQuickDialogWrapper>
+#include <KNS3/QtQuickDialogWrapper>
 #include <KPluginFactory>
 #include <KStandardAction>
 #include <KToolBar>
diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
index 96f469cce..8a71634fc 100644
--- a/klipper/klipper.cpp
+++ b/klipper/klipper.cpp
@@ -38,7 +38,11 @@
 #include "klipperpopup.h"
 #include "klippersettings.h"
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <Prison/Prison>
+#else
 #include <prison/Prison>
+#endif
 
 #include <config-X11.h>
 #if HAVE_X11
diff --git a/runners/locations/autotests/locationsrunnertest.cpp b/runners/locations/autotests/locationsrunnertest.cpp
index 743a47fb3..fd3071bc2 100644
--- a/runners/locations/autotests/locationsrunnertest.cpp
+++ b/runners/locations/autotests/locationsrunnertest.cpp
@@ -5,7 +5,7 @@
 */
 
 #include <KApplicationTrader>
-#include <KIOCore/KProtocolInfo>
+#include <KProtocolInfo>
 #include <KRunner/AbstractRunnerTest>
 #include <KShell>
 #include <QMimeData>