diff --git a/CMakeLists.txt b/CMakeLists.txt index 6966f35..372733e 100644 --- a/CMakeLists.txt +++ b/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(KF5WindowSystem REQUIRED) +find_package(Qt6 REQUIRED ${QT}) +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 - Qt5::Widgets - Qt5::DBus - Qt5::Quick - Qt5::QuickControls2 - KF5::WindowSystem + Qt6::Core + Qt6::Widgets + Qt6::DBus + Qt6::Quick + Qt6::QuickControls2 + 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) diff --git a/qml/GridItemDelegate.qml b/qml/GridItemDelegate.qml index cc27674..47af88d 100755 --- a/qml/GridItemDelegate.qml +++ b/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 diff --git a/qml/main.qml b/qml/main.qml index f5f4d2b..d30da35 100755 --- a/qml/main.qml +++ b/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 diff --git a/src/iconitem.cpp b/src/iconitem.cpp index 4efba95..9ae3339 100644 --- a/src/iconitem.cpp +++ b/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() diff --git a/src/iconitem.h b/src/iconitem.h index c87902e..e0c79fd 100644 --- a/src/iconitem.h +++ b/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; diff --git a/src/launcher.cpp b/src/launcher.cpp index a3bbeb6..3e9c6ca 100644 --- a/src/launcher.cpp +++ b/src/launcher.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include 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(); } - diff --git a/src/main.cpp b/src/main.cpp index 5a84886..0aba4fb 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -18,6 +18,7 @@ */ #include +#include #include #include #include