Unify Prison includes and make them work with KF6 everywhere

4 years ago · 16d483919f
parent eb3483123e
commit 16d483919f
2 changed files with 1 additions and 5 deletions
--- a/klipper/clipboardjob.cpp
+++ b/klipper/clipboardjob.cpp
@ -16,7 +16,7 @@
 #include <QIcon>
 #include <QtConcurrent>

-#include <prison/Prison>
+#include <Prison/Prison>

 const static QString s_iconKey = QStringLiteral("icon");
 const static QString s_previewKey = QStringLiteral("preview");
--- a/klipper/klipper.cpp
+++ b/klipper/klipper.cpp
@ -47,11 +47,7 @@
 #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