Page MenuHomePhorge
Files F28596

D91.1726793840.diff
No OneTemporary
Actions

D91.1726793840.diff
View Options

diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,3 @@
build
node_modules
TAGS
-/src/contents/ui/AvatarAdapter.qml
-/src/contents/ui/FileDialogAdapter.qml
-/src/contents/ui/FolderDialogAdapter.qml
-/src/contents/ui/ScrollablePageAdapter.qml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,20 +72,6 @@
- kazv-Release.AppImage
expire_in: 1 week
-'build:GNU/Linux-amd64-debug:kf5':
- extends: .build-debug
- before_script:
- - export KF_VER=5
- image:
- name: 'reg.lily.kazv.moe/kazv/libkazv/libkazv:servant-ubuntu20.04-debug'
-
-'build:GNU/Linux-amd64-prod:kf5':
- extends: .build-prod
- before_script:
- - export KF_VER=5
- image:
- name: 'reg.lily.kazv.moe/kazv/libkazv/libkazv:servant-ubuntu20.04-prod'
-
'build:GNU/Linux-amd64-debug:kf6':
extends: .build-debug
before_script:
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,20 +13,15 @@
set(CMAKE_CXX_STANDARD 17)
if(NOT kazv_KF_QT_MAJOR_VERSION)
- set(kazv_KF_QT_MAJOR_VERSION 5)
+ set(kazv_KF_QT_MAJOR_VERSION 6)
endif()
message(STATUS "KF/Qt major version: ${kazv_KF_QT_MAJOR_VERSION}")
-
+if(NOT kazv_KF_QT_MAJOR_VERSION EQUAL 6)
+ message(FATAL_ERROR "KF/Qt major version must be 6")
+endif()
set(QT_MAJOR_VERSION ${kazv_KF_QT_MAJOR_VERSION})
set(KF_MAJOR_VERSION ${kazv_KF_QT_MAJOR_VERSION})
-if(QT_MAJOR_VERSION EQUAL 5)
- set(QT_MIN_VERSION 5.15)
-endif()
-if(KF_MAJOR_VERSION EQUAL 5)
- set(KF_MIN_VERSION 5.78)
-endif()
-
find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
@@ -51,12 +46,7 @@
Core Gui Qml QuickControls2 Svg Concurrent Widgets
Multimedia Test Network QuickTest
)
-find_package(KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 Config KIO Notifications)
-if(KF_MAJOR_VERSION EQUAL 6)
- find_package(KF${KF_MAJOR_VERSION}KirigamiAddons REQUIRED)
-else()
- find_package(KF${KF_MAJOR_VERSION}KirigamiAddons)
-endif()
+find_package(KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS Kirigami Config KIO Notifications KirigamiAddons)
find_package(Threads REQUIRED)
find_package(nlohmann_json REQUIRED)
diff --git a/packaging/GNU-Linux/appimage/build.sh b/packaging/GNU-Linux/appimage/build.sh
--- a/packaging/GNU-Linux/appimage/build.sh
+++ b/packaging/GNU-Linux/appimage/build.sh
@@ -17,32 +17,8 @@
)
if [[ $KF_VER == 5 ]]; then
- DEP_PACKAGES+=(
- qtbase5-dev
- qtdeclarative5-dev
- qtmultimedia5-dev
- qml-module-qtmultimedia
- libqt5concurrent5
- libqt5gui5
- libqt5svg5-dev
- qtquickcontrols2-5-dev
- qml-module-qtquick-layouts
- qml-module-qtquick-controls2
- qml-module-qtquick-controls
- qml-module-qt-labs-qmlmodels
- kirigami2-dev
- libkf5config-dev
- libqt5multimedia5-plugins
- qt5-gtk-platformtheme
- plasma-integration
- libkf5kio-dev
- qml-module-qttest
- qml-module-qt-labs-platform
- libkf5notifications-dev
- qml-module-qtquick-dialogs
- qml-module-org-kde-notification
- )
- cp -v packaging/GNU-Linux/appimage/kde-neon-focal.list /etc/apt/sources.list.d/
+ echo "Building on KF5 is no longer supported."
+ exit 1
else
DEP_PACKAGES+=(
qt6-base-dev
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,16 +10,6 @@
configure_file(kazv-platform.hpp.in kazv-platform.hpp)
configure_file(kazv-defs.hpp.in kazv-defs.hpp)
-set(kazv_avatarAdapterFile ${CMAKE_CURRENT_SOURCE_DIR}/contents/ui/AvatarAdapter_KAC.qml)
-if(NOT KF${KF_MAJOR_VERSION}KirigamiAddons_FOUND)
- set(kazv_avatarAdapterFile ${CMAKE_CURRENT_SOURCE_DIR}/contents/ui/AvatarAdapter_Kirigami.qml)
-endif()
-
-configure_file(${kazv_avatarAdapterFile} ${CMAKE_CURRENT_SOURCE_DIR}/contents/ui/AvatarAdapter.qml COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/contents/ui/FileDialogAdapter_Qt${QT_MAJOR_VERSION}.qml ${CMAKE_CURRENT_SOURCE_DIR}/contents/ui/FileDialogAdapter.qml COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/contents/ui/FolderDialogAdapter_Qt${QT_MAJOR_VERSION}.qml ${CMAKE_CURRENT_SOURCE_DIR}/contents/ui/FolderDialogAdapter.qml COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/contents/ui/ScrollablePageAdapter_KF${KF_MAJOR_VERSION}.qml ${CMAKE_CURRENT_SOURCE_DIR}/contents/ui/ScrollablePageAdapter.qml COPYONLY)
-
set(kazvprivlib_SRCS
qt-job-handler.cpp
qt-job.cpp
diff --git a/src/contents/ui/AvatarAdapter_KAC.qml b/src/contents/ui/AvatarAdapter.qml
rename from src/contents/ui/AvatarAdapter_KAC.qml
rename to src/contents/ui/AvatarAdapter.qml
diff --git a/src/contents/ui/AvatarAdapter_Kirigami.qml b/src/contents/ui/AvatarAdapter_Kirigami.qml
deleted file mode 100644
--- a/src/contents/ui/AvatarAdapter_Kirigami.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * This file is part of kazv.
- * SPDX-FileCopyrightText: 2024 tusooa <tusooa@kazv.moe>
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-import QtQuick 2.15
-import org.kde.kirigami 2.20 as Kirigami
-
-Kirigami.Avatar {
-}
diff --git a/src/contents/ui/FileDialogAdapter_Qt6.qml b/src/contents/ui/FileDialogAdapter.qml
rename from src/contents/ui/FileDialogAdapter_Qt6.qml
rename to src/contents/ui/FileDialogAdapter.qml
diff --git a/src/contents/ui/FileDialogAdapter_Qt5.qml b/src/contents/ui/FileDialogAdapter_Qt5.qml
deleted file mode 100644
--- a/src/contents/ui/FileDialogAdapter_Qt5.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * This file is part of kazv.
- * SPDX-FileCopyrightText: 2024 tusooa <tusooa@kazv.moe>
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-import QtQuick 2.15
-import QtQuick.Dialogs 1.3
-
-FileDialog {
-}
diff --git a/src/contents/ui/FolderDialogAdapter_Qt6.qml b/src/contents/ui/FolderDialogAdapter.qml
rename from src/contents/ui/FolderDialogAdapter_Qt6.qml
rename to src/contents/ui/FolderDialogAdapter.qml
diff --git a/src/contents/ui/FolderDialogAdapter_Qt5.qml b/src/contents/ui/FolderDialogAdapter_Qt5.qml
deleted file mode 100644
--- a/src/contents/ui/FolderDialogAdapter_Qt5.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * This file is part of kazv.
- * SPDX-FileCopyrightText: 2024 tusooa <tusooa@kazv.moe>
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-import QtQuick 2.15
-import QtQuick.Dialogs 1.3
-
-FileDialog {
- selectFolder: true
-}
diff --git a/src/contents/ui/ScrollablePageAdapter_KF6.qml b/src/contents/ui/ScrollablePageAdapter.qml
rename from src/contents/ui/ScrollablePageAdapter_KF6.qml
rename to src/contents/ui/ScrollablePageAdapter.qml
diff --git a/src/contents/ui/ScrollablePageAdapter_KF5.qml b/src/contents/ui/ScrollablePageAdapter_KF5.qml
deleted file mode 100644
--- a/src/contents/ui/ScrollablePageAdapter_KF5.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * This file is part of kazv.
- * SPDX-FileCopyrightText: 2024 tusooa <tusooa@kazv.moe>
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-import QtQuick 2.15
-import org.kde.kirigami 2.13 as Kirigami
-
-Kirigami.ScrollablePage {
-}

File Metadata

Mime Type
text/plain
Expires
Thu, Sep 19, 5:57 PM (3 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15997
Default Alt Text
D91.1726793840.diff (6 KB)

Event Timeline