Import QX11Info from QtGuiPrivate

app/primaryoutputwatcher.cpp

@@ -19,11 +19,7 @@
 #include <config-latte.h>
 #if HAVE_X11
 #include <QTimer> //Used only in x11 case
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 #include <private/qtx11extras_p.h>
-#else
-#include <QX11Info>
-#endif
 #include <xcb/randr.h>
 #include <xcb/xcb.h>
 #include <xcb/xcb_event.h>

app/screenpool.cpp

@@ -22,9 +22,9 @@
 
 // X11
 #if HAVE_X11
-#include <QtX11Extras/QX11Info>
-#include <xcb/xcb.h>
+#include <private/qtx11extras_p.h>
 #include <xcb/randr.h>
+#include <xcb/xcb.h>
 #include <xcb/xcb_event.h>
 #endif
 
@@ -141,11 +141,7 @@ void ScreenPool::updateScreenGeometry(const int &screenId, const QRect &screenGe
     emit screenGeometryChanged();
 }
 
-
-Latte::Data::ScreensTable ScreenPool::screensTable()
-{   
-    return m_screensTable;
-}
+Latte::Data::ScreensTable ScreenPool::screensTable() { return m_screensTable; }
 
 void ScreenPool::reload(QString path)
 {
@@ -242,8 +238,7 @@ int ScreenPool::id(const QString &connector) const
     return screenId.isEmpty() ? NOSCREENID : screenId.toInt();
 }
 
-QString ScreenPool::connector(int id) const
-{   
+QString ScreenPool::connector(int id) const {
     QString idStr = QString::number(id);
     return (m_screensTable.containsId(idStr) ? m_screensTable[idStr].name : QString());
 }

app/shortcuts/globalshortcuts.cpp

@@ -25,9 +25,9 @@
 // Qt
 #include <QAction>
 #include <QDebug>
-#include <QQuickItem>
 #include <QMetaMethod>
-#include <QX11Info>
+#include <QQuickItem>
+#include <private/qtx11extras_p.h>
 
 // KDE
 #include <KActionCollection>

app/wm/tasktools.cpp

@@ -24,7 +24,7 @@
 #include <QScreen>
 #include <QUrlQuery>
 #if HAVE_X11
-#include <QX11Info>
+#include <private/qtx11extras_p.h>
 #endif
 
 namespace Latte

app/wm/waylandinterface.cpp

@@ -16,12 +16,12 @@
 #include "../lattecorona.h"
 
 // Qt
-#include <QDebug>
-#include <QTimer>
 #include <QApplication>
-#include <QtX11Extras/QX11Info>
-#include <QQuickView>
+#include <QDebug>
 #include <QLatin1String>
+#include <QQuickView>
+#include <QTimer>
+#include <private/qtx11extras_p.h>
 
 // KDE
 #include <KWindowSystem>

app/wm/xwindowinterface.cpp

@@ -16,7 +16,7 @@
 // Qt
 #include <QDebug>
 #include <QTimer>
-#include <QtX11Extras/QX11Info>
+#include <private/qtx11extras_p.h>
 
 // KDE
 #include <KDesktopFile>