Skip to content

chore: drop Qt5 build support #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BLumia merged 1 commit into from
Feb 2, 2024
Merged

chore: drop Qt5 build support #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 9 additions & 17 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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")
Expand All @@ -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}
Expand Down
10 changes: 5 additions & 5 deletions archlinux/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Maintainer: justforlxz <justforlxz@gmail.com>
pkgname=deepin-launchpad-git
pkgver=0.0.0
pkgver=0.5.0
pkgrel=1
sourcename=dde-launchpad
sourcetars=("$sourcename"_"$pkgver".tar.xz)
Expand All @@ -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')
Expand Down