diff --git a/debian/control b/debian/control index 2bc21add..0ad3726d 100644 --- a/debian/control +++ b/debian/control @@ -9,19 +9,18 @@ Build-Depends: libglib2.0-dev, # v-- to get systemduserunitdir from its pkg-config data systemd, - qtbase5-dev, - libqt5svg5-dev, - qtdeclarative5-dev, - qttools5-dev, - qttools5-dev-tools, - qtquickcontrols2-5-dev, + qt6-base-dev, + qt6-svg-dev, + qt6-declarative-dev, + qt6-tools-dev, + qt6-tools-dev-tools, libdtkcommon-dev, - libdtkcore-dev, + libdtk6core-dev, # v-- provides qdbusxml2cpp-fix binary - libdtkcore5-bin, + libdtk6core-bin, # v-- provides DHiDPIHelper - libdtkgui-dev, - libdtkdeclarative-dev, + libdtk6gui-dev, + libdtk6declarative-dev, libappstreamqt-dev Standards-Version: 4.6.0 Rules-Requires-Root: no @@ -31,13 +30,12 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - qml-module-qtquick-layouts, - qml-module-qtquick-window2, - qml-module-qtquick-controls2, - qml-module-qtquick-controls2-styles-chameleon, + qml6-module-qtquick-layouts, + qml6-module-qtquick-window, + qml6-module-qtquick-controls, + qml6-module-qtquick-controls2-styles-chameleon, # v-- actually should be depended by qqc2-styles-chameleon - qml-module-qtgraphicaleffects, - qml-module-org-kde-kitemmodels + qml6-module-qt5compat-graphicaleffects Conflicts: dde-launcher Replaces: dde-launcher Description: diff --git a/debian/rules b/debian/rules index aad46f1c..16f88f11 100755 --- a/debian/rules +++ b/debian/rules @@ -16,4 +16,5 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all override_dh_auto_configure: dh_auto_configure -- \ - -DVERSION=$(DEB_VERSION_UPSTREAM) + -DVERSION=$(DEB_VERSION_UPSTREAM) \ + -DPREFER_QT_5=OFF diff --git a/src/models/appitem.h b/src/models/appitem.h index 4c4fc6c0..e7970f8c 100644 --- a/src/models/appitem.h +++ b/src/models/appitem.h @@ -5,6 +5,7 @@ #pragma once #include +#include class AppItem : public QStandardItem { @@ -35,6 +36,7 @@ class AppItem : public QStandardItem Q_ENUM(DDECategories) public: + explicit AppItem() { Q_ASSERT_X(false, "AppItem()", "qmlRegisterUncreatableType require this for unknown reason in Qt6, another ctor should be used"); } explicit AppItem(const QString &freedesktopId); ~AppItem(); diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index 4856d3b1..c6d564a3 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: CC0-1.0 -find_package(Qt5 REQUIRED Quick) +find_package(${QT_NS} REQUIRED Quick) add_library(launcher-qml-utils OBJECT)