From 305a15a250e0e4094c5da69168bfe433e5896df2 Mon Sep 17 00:00:00 2001 From: Wang Zichong Date: Mon, 29 Jan 2024 13:36:43 +0800 Subject: [PATCH] chore: drop Qt5 build support Log: --- CMakeLists.txt | 26 +++++++++----------------- archlinux/PKGBUILD | 10 +++++----- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b98f8ef4..63ddf319 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,27 +20,15 @@ set(BIN_NAME dde-launchpad) include(FeatureSummary) include(GNUInstallDirs) -option(PREFER_QT_5 "Prefer to use Qt 5 even if we have Qt 6" ON) - -if(PREFER_QT_5) - set(QT_NS Qt5) - set(DTK_NS Dtk) - set(ASQT_NS AppStreamQt5) -else() - set(QT_NS Qt6) - set(DTK_NS Dtk6) - set(ASQT_NS AppStreamQt) -endif() +set(QT_NS Qt6) +set(DTK_NS Dtk6) +set(ASQT_NS AppStreamQt) find_package(QT NAMES ${QT_NS} REQUIRED COMPONENTS Core) find_package(${QT_NS} REQUIRED COMPONENTS Core Gui Concurrent Qml Svg Quick QuickControls2 LinguistTools) find_package(${DTK_NS} REQUIRED COMPONENTS Core Gui) find_package(${ASQT_NS} 1.0) -if(${QT_VERSION_MAJOR} EQUAL "5") - find_package(${QT_NS} REQUIRED COMPONENTS QuickCompiler) -endif() - set_package_properties(${ASQT_NS} PROPERTIES DESCRIPTION "Library that lists Appstream resources" URL "https://www.freedesktop.org" @@ -93,8 +81,6 @@ set(TRANSLATION_FILES translations/dde-launchpad_zh_TW.ts ) -qt_create_translation(TRANSLATED_FILES ${QML_FILES} ${SOURCE_FILES} src/models/appitem.cpp ${TRANSLATION_FILES}) - qt_add_dbus_adaptor(DBUS_ADAPTER_FILES dbus/org.deepin.dde.Launcher1.xml launchercontroller.h LauncherController) if(${QT_VERSION_MAJOR} EQUAL "5") @@ -110,6 +96,12 @@ add_executable(${BIN_NAME} ${TRANSLATED_FILES} ) +qt_add_translations(${BIN_NAME} + TS_FILES ${TRANSLATION_FILES} + SOURCES ${QML_FILES} ${SOURCE_FILES} src/models/appitem.cpp + QM_FILES_OUTPUT_VARIABLE TRANSLATED_FILES +) + target_compile_definitions(${BIN_NAME} PRIVATE DDE_LAUNCHPAD_VERSION=${CMAKE_PROJECT_VERSION} diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index 9e9a6b41..5dbb95c6 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: justforlxz pkgname=deepin-launchpad-git -pkgver=0.0.0 +pkgver=0.5.0 pkgrel=1 sourcename=dde-launchpad sourcetars=("$sourcename"_"$pkgver".tar.xz) @@ -9,10 +9,10 @@ pkgdesc='Deepin desktop-environment - Launchpad module' arch=('x86_64' 'aarch64') url="https://github.com/linuxdeepin/dde-launchpad" license=('GPL3') -depends=('qt5-svg' 'qt5-quickcontrols' 'appstream-qt' - 'dtkdeclarative-git' 'dtkgui-git' 'dtkwidget-git' 'dtkcore-git' - 'qt5-base' 'qt5-x11extras' 'qt5-svg') -makedepends=('git' 'cmake' 'ninja' 'qt5-tools' 'dtkcommon' ) +depends=('qt6-svg' 'qt6-declarative' 'appstream-qt' + 'dtk6declarative-git' 'dtk6gui-git' 'dtk6widget-git' 'dtk6core-git' + 'qt6-base' 'qt6-svg') +makedepends=('git' 'cmake' 'ninja' 'qt6-tools' 'dtkcommon' ) conflicts=('deepin-launcher') provides=('deepin-launchpad') groups=('deepin-git')