fix(launcher): port launcher to Qt6

CMakeLists.txt

@@ -11,8 +11,8 @@ set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(QT Core Widgets DBus Quick QuickControls2 LinguistTools)
-find_package(Qt5 REQUIRED ${QT})
+find_package(Qt6 REQUIRED ${QT})
-find_package(KF5WindowSystem REQUIRED)
+find_package(KF6WindowSystem REQUIRED)
 
 set(SRCS
     src/desktopproperties.cpp
@@ -33,7 +33,7 @@ set(RESOURCES
     qml.qrc
 )
 
-qt5_add_dbus_adaptor(DBUS_SRCS
+qt6_add_dbus_adaptor(DBUS_SRCS
     src/com.cutefish.Launcher.xml
     src/launcher.h
     Launcher
@@ -44,16 +44,16 @@ set_source_files_properties(${DBUS_SRCS} PROPERTIES SKIP_AUTOGEN ON)
 
 add_executable(${PROJECT_NAME} ${SRCS} ${DBUS_SRCS} ${RESOURCES})
 target_link_libraries(${PROJECT_NAME}
-        Qt5::Core
+        Qt6::Core
-        Qt5::Widgets
+        Qt6::Widgets
-        Qt5::DBus
+        Qt6::DBus
-        Qt5::Quick
+        Qt6::Quick
-        Qt5::QuickControls2
+        Qt6::QuickControls2
-        KF5::WindowSystem
+        KF6::WindowSystem
 )
 
 file(GLOB TS_FILES translations/*.ts)
-qt5_add_translation(QM_FILES ${TS_FILES})
+qt6_add_translation(QM_FILES ${TS_FILES})
 add_custom_target(translations DEPENDS ${QM_FILES} SOURCES ${TS_FILES})
 add_dependencies(${PROJECT_NAME} translations)
 

qml/GridItemDelegate.qml

@@ -19,7 +19,7 @@
 
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import QtQuick.Window 2.12
 import QtQuick.Layouts 1.12
 import FishUI 1.0 as FishUI

qml/main.qml

@@ -21,7 +21,7 @@ import QtQuick 2.12
 import QtQuick.Window 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 
 import Cutefish.Launcher 1.0
 import Cutefish.System 1.0 as System

src/iconitem.cpp

@@ -71,12 +71,12 @@ QSGNode *IconItem::updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNode
     return textureNode;
 }
 
-void IconItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void IconItem::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     polish();
     update();
 
-    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChange(newGeometry, oldGeometry);
 }
 
 void IconItem::componentComplete()

src/iconitem.h

@@ -22,7 +22,7 @@ public:
     int paintedHeight() const;
 
     QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData) override;
-    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
 
     void componentComplete() override;
     void updatePolish() override;

src/launcher.cpp

@@ -29,7 +29,7 @@
 #include <QScreen>
 #include <QTimer>
 
-#include <KWindowSystem>
+#include <KX11Extras>
 
 Launcher::Launcher(bool firstShow, QQuickView *w)
     : QQuickView(w)
@@ -49,7 +49,6 @@ Launcher::Launcher(bool firstShow, QQuickView *w)
     setColor(Qt::transparent);
     setFlags(Qt::FramelessWindowHint);
     setResizeMode(QQuickView::SizeRootObjectToView);
-    setClearBeforeRendering(true);
     onGeometryChanged();
 
     setSource(QUrl(QStringLiteral("qrc:/qml/main.qml")));
@@ -192,7 +191,7 @@ void Launcher::onGeometryChanged()
 
 void Launcher::showEvent(QShowEvent *e)
 {
-    KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager);
+    KX11Extras::setState(winId(), NET::SkipTaskbar | NET::SkipPager);
 
     QQuickView::showEvent(e);
 }
@@ -208,4 +207,3 @@ void Launcher::onActiveChanged()
     if (!isActive())
         Launcher::hide();
 }
-

src/main.cpp

@@ -18,6 +18,7 @@
  */
 
 #include <QApplication>
+#include <QFile>
 #include <QDBusConnection>
 #include <QDBusInterface>
 #include <QPixmapCache>