Git commit 837bde04a5b2e56cf764f6dbc551493fa9ac1439 by Friedrich W. H. Kossebau.
Committed on 04/11/2023 at 15:29.
Pushed by kossebau into branch 'master'.
Port KF5 templates to KF6
M +2 -2 src/templates/C++/CMakeLists.txt
R +10 -6 src/templates/C++/kde-frameworks6-simple/CMakeLists.txt [from:
src/templates/C++/kde-frameworks5-simple/CMakeLists.txt - 062% similarity]
R +0 -0
src/templates/C++/kde-frameworks6-simple/LICENSES/GPL-2.0-only.txt [from:
src/templates/C++/kde-frameworks5-simple/LICENSES/GPL-2.0-only.txt - 100%
similarity]
R +0 -0
src/templates/C++/kde-frameworks6-simple/LICENSES/GPL-3.0-only.txt [from:
src/templates/C++/kde-frameworks5-simple/LICENSES/GPL-3.0-only.txt - 100%
similarity]
R +0 -0
src/templates/C++/kde-frameworks6-simple/LICENSES/LicenseRef-KDE-Accepted-GPL.txt
[from:
src/templates/C++/kde-frameworks5-simple/LICENSES/LicenseRef-KDE-Accepted-GPL.txt
- 100% similarity]
R +0 -0 src/templates/C++/kde-frameworks6-simple/Messages.sh [from:
src/templates/C++/kde-frameworks5-simple/Messages.sh - 100% similarity]
R +0 -0 src/templates/C++/kde-frameworks6-simple/README [from:
src/templates/C++/kde-frameworks5-simple/README - 100% similarity]
R +- --
src/templates/C++/kde-frameworks6-simple/icons/16-apps-%{APPNAMELC}.png [from:
src/templates/C++/kde-frameworks5-simple/icons/16-apps-%{APPNAMELC}.png - 100%
similarity]
R +- --
src/templates/C++/kde-frameworks6-simple/icons/22-apps-%{APPNAMELC}.png [from:
src/templates/C++/kde-frameworks5-simple/icons/22-apps-%{APPNAMELC}.png - 100%
similarity]
R +- --
src/templates/C++/kde-frameworks6-simple/icons/32-apps-%{APPNAMELC}.png [from:
src/templates/C++/kde-frameworks5-simple/icons/32-apps-%{APPNAMELC}.png - 100%
similarity]
R +- --
src/templates/C++/kde-frameworks6-simple/icons/48-apps-%{APPNAMELC}.png [from:
src/templates/C++/kde-frameworks5-simple/icons/48-apps-%{APPNAMELC}.png - 100%
similarity]
R +0 -0 src/templates/C++/kde-frameworks6-simple/icons/CMakeLists.txt
[from: src/templates/C++/kde-frameworks5-simple/icons/CMakeLists.txt - 100%
similarity]
R +2 -3
src/templates/C++/kde-frameworks6-simple/kde-frameworks6-simple.kdevtemplate
[from:
src/templates/C++/kde-frameworks5-simple/kde-frameworks5-simple.kdevtemplate -
052% similarity]
R +- --
src/templates/C++/kde-frameworks6-simple/kde-frameworks6-simple.png [from:
src/templates/C++/kde-frameworks5-simple/kde-frameworks5-simple.png - 100%
similarity]
R +0 -0 src/templates/C++/kde-frameworks6-simple/src/%{APPNAMELC}.ui
[from: src/templates/C++/kde-frameworks5-simple/src/%{APPNAMELC}.ui - 100%
similarity]
R +0 -0
src/templates/C++/kde-frameworks6-simple/src/%{APPNAMELC}window.cpp [from:
src/templates/C++/kde-frameworks5-simple/src/%{APPNAMELC}window.cpp - 100%
similarity]
R +0 -0
src/templates/C++/kde-frameworks6-simple/src/%{APPNAMELC}window.h [from:
src/templates/C++/kde-frameworks5-simple/src/%{APPNAMELC}window.h - 100%
similarity]
R +3 -3 src/templates/C++/kde-frameworks6-simple/src/CMakeLists.txt
[from: src/templates/C++/kde-frameworks5-simple/src/CMakeLists.txt - 089%
similarity]
R +0 -0 src/templates/C++/kde-frameworks6-simple/src/main.cpp [from:
src/templates/C++/kde-frameworks5-simple/src/main.cpp - 100% similarity]
R +0 -0
src/templates/C++/kde-frameworks6-simple/src/org.example.%{APPNAMELC}.desktop
[from:
src/templates/C++/kde-frameworks5-simple/src/org.example.%{APPNAMELC}.desktop -
100% similarity]
R +0 -6
src/templates/C++/kde-frameworks6-simple/src/org.example.%{APPNAMELC}.metainfo.xml
[from:
src/templates/C++/kde-frameworks5-simple/src/org.example.%{APPNAMELC}.metainfo.xml
- 082% similarity]
R +10 -6 src/templates/C++/kde-frameworks6/CMakeLists.txt [from:
src/templates/C++/kde-frameworks5/CMakeLists.txt - 068% similarity]
R +0 -0 src/templates/C++/kde-frameworks6/LICENSES/GFDL-1.2-or-later.txt
[from: src/templates/C++/kde-frameworks5/LICENSES/GFDL-1.2-or-later.txt - 100%
similarity]
R +0 -0 src/templates/C++/kde-frameworks6/LICENSES/GPL-2.0-only.txt
[from: src/templates/C++/kde-frameworks5/LICENSES/GPL-2.0-only.txt - 100%
similarity]
R +0 -0 src/templates/C++/kde-frameworks6/LICENSES/GPL-3.0-only.txt
[from: src/templates/C++/kde-frameworks5/LICENSES/GPL-3.0-only.txt - 100%
similarity]
R +0 -0
src/templates/C++/kde-frameworks6/LICENSES/LicenseRef-KDE-Accepted-GPL.txt
[from:
src/templates/C++/kde-frameworks5/LICENSES/LicenseRef-KDE-Accepted-GPL.txt -
100% similarity]
R +0 -0 src/templates/C++/kde-frameworks6/Messages.sh [from:
src/templates/C++/kde-frameworks5/Messages.sh - 100% similarity]
R +0 -0 src/templates/C++/kde-frameworks6/README [from:
src/templates/C++/kde-frameworks5/README - 100% similarity]
R +0 -0 src/templates/C++/kde-frameworks6/doc/CMakeLists.txt [from:
src/templates/C++/kde-frameworks5/doc/CMakeLists.txt - 100% similarity]
R +2 -2 src/templates/C++/kde-frameworks6/doc/index.docbook [from:
src/templates/C++/kde-frameworks5/doc/index.docbook - 099% similarity]
R +- -- src/templates/C++/kde-frameworks6/icons/16-apps-%{APPNAMELC}.png
[from: src/templates/C++/kde-frameworks5/icons/16-apps-%{APPNAMELC}.png - 100%
similarity]
R +- -- src/templates/C++/kde-frameworks6/icons/22-apps-%{APPNAMELC}.png
[from: src/templates/C++/kde-frameworks5/icons/22-apps-%{APPNAMELC}.png - 100%
similarity]
R +- -- src/templates/C++/kde-frameworks6/icons/32-apps-%{APPNAMELC}.png
[from: src/templates/C++/kde-frameworks5/icons/32-apps-%{APPNAMELC}.png - 100%
similarity]
R +- -- src/templates/C++/kde-frameworks6/icons/48-apps-%{APPNAMELC}.png
[from: src/templates/C++/kde-frameworks5/icons/48-apps-%{APPNAMELC}.png - 100%
similarity]
R +0 -0 src/templates/C++/kde-frameworks6/icons/CMakeLists.txt [from:
src/templates/C++/kde-frameworks5/icons/CMakeLists.txt - 100% similarity]
R +- --
src/templates/C++/kde-frameworks6/icons/sc-apps-%{APPNAMELC}.svgz [from:
src/templates/C++/kde-frameworks5/icons/sc-apps-%{APPNAMELC}.svgz - 100%
similarity]
R +2 -3 src/templates/C++/kde-frameworks6/kde-frameworks6.kdevtemplate
[from: src/templates/C++/kde-frameworks5/kde-frameworks5.kdevtemplate - 055%
similarity]
R +- -- src/templates/C++/kde-frameworks6/kde-frameworks6.png [from:
src/templates/C++/kde-frameworks5/kde-frameworks5.png - 100% similarity]
R +0 -0 src/templates/C++/kde-frameworks6/src/%{APPNAMELC}ui.rc [from:
src/templates/C++/kde-frameworks5/src/%{APPNAMELC}ui.rc - 100% similarity]
R +0 -0 src/templates/C++/kde-frameworks6/src/%{APPNAMELC}view.cpp
[from: src/templates/C++/kde-frameworks5/src/%{APPNAMELC}view.cpp - 100%
similarity]
R +0 -0 src/templates/C++/kde-frameworks6/src/%{APPNAMELC}view.h [from:
src/templates/C++/kde-frameworks5/src/%{APPNAMELC}view.h - 100% similarity]
R +0 -0 src/templates/C++/kde-frameworks6/src/%{APPNAMELC}view.ui [from:
src/templates/C++/kde-frameworks5/src/%{APPNAMELC}view.ui - 100% similarity]
R +0 -0 src/templates/C++/kde-frameworks6/src/%{APPNAMELC}window.cpp
[from: src/templates/C++/kde-frameworks5/src/%{APPNAMELC}window.cpp - 100%
similarity]
R +0 -0 src/templates/C++/kde-frameworks6/src/%{APPNAMELC}window.h
[from: src/templates/C++/kde-frameworks5/src/%{APPNAMELC}window.h - 100%
similarity]
R +0 -0 src/templates/C++/kde-frameworks6/src/%{APPNAME}Settings.kcfg
[from: src/templates/C++/kde-frameworks5/src/%{APPNAME}Settings.kcfg - 100%
similarity]
R +0 -0 src/templates/C++/kde-frameworks6/src/%{APPNAME}Settings.kcfgc
[from: src/templates/C++/kde-frameworks5/src/%{APPNAME}Settings.kcfgc - 100%
similarity]
R +7 -7 src/templates/C++/kde-frameworks6/src/CMakeLists.txt [from:
src/templates/C++/kde-frameworks5/src/CMakeLists.txt - 086% similarity]
R +0 -0 src/templates/C++/kde-frameworks6/src/main.cpp [from:
src/templates/C++/kde-frameworks5/src/main.cpp - 100% similarity]
R +0 -0
src/templates/C++/kde-frameworks6/src/org.example.%{APPNAMELC}.desktop [from:
src/templates/C++/kde-frameworks5/src/org.example.%{APPNAMELC}.desktop - 100%
similarity]
R +0 -6
src/templates/C++/kde-frameworks6/src/org.example.%{APPNAMELC}.metainfo.xml
[from:
src/templates/C++/kde-frameworks5/src/org.example.%{APPNAMELC}.metainfo.xml -
082% similarity]
R +0 -0 src/templates/C++/kde-frameworks6/src/settings.ui [from:
src/templates/C++/kde-frameworks5/src/settings.ui - 100% similarity]
https://invent.kde.org/sdk/kapptemplate/-/commit/837bde04a5b2e56cf764f6dbc551493fa9ac1439
diff --git a/src/templates/C++/CMakeLists.txt b/src/templates/C++/CMakeLists.txt
index b938c39e..19b72774 100644
--- a/src/templates/C++/CMakeLists.txt
+++ b/src/templates/C++/CMakeLists.txt
@@ -1,6 +1,6 @@
set(APPTEMPLATE_DIRS
- kde-frameworks5-simple
- kde-frameworks5
+ kde-frameworks6-simple
+ kde-frameworks6
)
kde_package_app_templates(TEMPLATES ${APPTEMPLATE_DIRS} INSTALL_DIR
${KDE_INSTALL_KAPPTEMPLATESDIR})
diff --git a/src/templates/C++/kde-frameworks5-simple/CMakeLists.txt
b/src/templates/C++/kde-frameworks6-simple/CMakeLists.txt
similarity index 62%
rename from src/templates/C++/kde-frameworks5-simple/CMakeLists.txt
rename to src/templates/C++/kde-frameworks6-simple/CMakeLists.txt
index 605e32f5..113457cd 100644
--- a/src/templates/C++/kde-frameworks5-simple/CMakeLists.txt
+++ b/src/templates/C++/kde-frameworks6-simple/CMakeLists.txt
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.16)
-project(%{APPNAMELC})
+project(%{APPNAMELC} VERSION %{VERSION})
-set(QT_MIN_VERSION "5.15.0")
-set(KF_MIN_VERSION "5.83.0")
+set(QT_MIN_VERSION "6.5.0")
+set(KF_MIN_VERSION "5.240.0")
-find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
+find_package(ECM ${KF_MIN_VERSION} REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(KDEInstallDirs)
@@ -14,9 +14,13 @@ include(KDECompilerSettings NO_POLICY_SCOPE)
include(ECMInstallIcons)
include(FeatureSummary)
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets)
+find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS
+ Core
+ Gui
+ Widgets
+)
-find_package(KF5 ${KF_MIN_VERSION} REQUIRED COMPONENTS
+find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS
CoreAddons
I18n
)
diff --git a/src/templates/C++/kde-frameworks5-simple/LICENSES/GPL-2.0-only.txt
b/src/templates/C++/kde-frameworks6-simple/LICENSES/GPL-2.0-only.txt
similarity index 100%
rename from src/templates/C++/kde-frameworks5-simple/LICENSES/GPL-2.0-only.txt
rename to src/templates/C++/kde-frameworks6-simple/LICENSES/GPL-2.0-only.txt
diff --git a/src/templates/C++/kde-frameworks5-simple/LICENSES/GPL-3.0-only.txt
b/src/templates/C++/kde-frameworks6-simple/LICENSES/GPL-3.0-only.txt
similarity index 100%
rename from src/templates/C++/kde-frameworks5-simple/LICENSES/GPL-3.0-only.txt
rename to src/templates/C++/kde-frameworks6-simple/LICENSES/GPL-3.0-only.txt
diff --git
a/src/templates/C++/kde-frameworks5-simple/LICENSES/LicenseRef-KDE-Accepted-GPL.txt
b/src/templates/C++/kde-frameworks6-simple/LICENSES/LicenseRef-KDE-Accepted-GPL.txt
similarity index 100%
rename from
src/templates/C++/kde-frameworks5-simple/LICENSES/LicenseRef-KDE-Accepted-GPL.txt
rename to
src/templates/C++/kde-frameworks6-simple/LICENSES/LicenseRef-KDE-Accepted-GPL.txt
diff --git a/src/templates/C++/kde-frameworks5-simple/Messages.sh
b/src/templates/C++/kde-frameworks6-simple/Messages.sh
similarity index 100%
rename from src/templates/C++/kde-frameworks5-simple/Messages.sh
rename to src/templates/C++/kde-frameworks6-simple/Messages.sh
diff --git a/src/templates/C++/kde-frameworks5-simple/README
b/src/templates/C++/kde-frameworks6-simple/README
similarity index 100%
rename from src/templates/C++/kde-frameworks5-simple/README
rename to src/templates/C++/kde-frameworks6-simple/README
diff --git
a/src/templates/C++/kde-frameworks5-simple/icons/16-apps-%{APPNAMELC}.png
b/src/templates/C++/kde-frameworks6-simple/icons/16-apps-%{APPNAMELC}.png
similarity index 100%
rename from
src/templates/C++/kde-frameworks5-simple/icons/16-apps-%{APPNAMELC}.png
rename to
src/templates/C++/kde-frameworks6-simple/icons/16-apps-%{APPNAMELC}.png
diff --git
a/src/templates/C++/kde-frameworks5-simple/icons/22-apps-%{APPNAMELC}.png
b/src/templates/C++/kde-frameworks6-simple/icons/22-apps-%{APPNAMELC}.png
similarity index 100%
rename from
src/templates/C++/kde-frameworks5-simple/icons/22-apps-%{APPNAMELC}.png
rename to
src/templates/C++/kde-frameworks6-simple/icons/22-apps-%{APPNAMELC}.png
diff --git
a/src/templates/C++/kde-frameworks5-simple/icons/32-apps-%{APPNAMELC}.png
b/src/templates/C++/kde-frameworks6-simple/icons/32-apps-%{APPNAMELC}.png
similarity index 100%
rename from
src/templates/C++/kde-frameworks5-simple/icons/32-apps-%{APPNAMELC}.png
rename to
src/templates/C++/kde-frameworks6-simple/icons/32-apps-%{APPNAMELC}.png
diff --git
a/src/templates/C++/kde-frameworks5-simple/icons/48-apps-%{APPNAMELC}.png
b/src/templates/C++/kde-frameworks6-simple/icons/48-apps-%{APPNAMELC}.png
similarity index 100%
rename from
src/templates/C++/kde-frameworks5-simple/icons/48-apps-%{APPNAMELC}.png
rename to
src/templates/C++/kde-frameworks6-simple/icons/48-apps-%{APPNAMELC}.png
diff --git a/src/templates/C++/kde-frameworks5-simple/icons/CMakeLists.txt
b/src/templates/C++/kde-frameworks6-simple/icons/CMakeLists.txt
similarity index 100%
rename from src/templates/C++/kde-frameworks5-simple/icons/CMakeLists.txt
rename to src/templates/C++/kde-frameworks6-simple/icons/CMakeLists.txt
diff --git
a/src/templates/C++/kde-frameworks5-simple/kde-frameworks5-simple.kdevtemplate
b/src/templates/C++/kde-frameworks6-simple/kde-frameworks6-simple.kdevtemplate
similarity index 52%
rename from
src/templates/C++/kde-frameworks5-simple/kde-frameworks5-simple.kdevtemplate
rename to
src/templates/C++/kde-frameworks6-simple/kde-frameworks6-simple.kdevtemplate
index 38d7b267..a947f3e2 100644
---
a/src/templates/C++/kde-frameworks5-simple/kde-frameworks5-simple.kdevtemplate
+++
b/src/templates/C++/kde-frameworks6-simple/kde-frameworks6-simple.kdevtemplate
@@ -1,7 +1,6 @@
-# KDE Config File
[General]
Name=Minimal C++ KDE Frameworks
-Comment=A very basic KDE Frameworks 5 GUI Application in C++
+Comment=A very basic KDE Frameworks 6 GUI Application in C++
Category=Qt/Graphical
-Icon=kde-frameworks5-simple.png
+Icon=kde-frameworks6-simple.png
ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}window.cpp
diff --git
a/src/templates/C++/kde-frameworks5-simple/kde-frameworks5-simple.png
b/src/templates/C++/kde-frameworks6-simple/kde-frameworks6-simple.png
similarity index 100%
rename from src/templates/C++/kde-frameworks5-simple/kde-frameworks5-simple.png
rename to src/templates/C++/kde-frameworks6-simple/kde-frameworks6-simple.png
diff --git a/src/templates/C++/kde-frameworks5-simple/src/%{APPNAMELC}.ui
b/src/templates/C++/kde-frameworks6-simple/src/%{APPNAMELC}.ui
similarity index 100%
rename from src/templates/C++/kde-frameworks5-simple/src/%{APPNAMELC}.ui
rename to src/templates/C++/kde-frameworks6-simple/src/%{APPNAMELC}.ui
diff --git
a/src/templates/C++/kde-frameworks5-simple/src/%{APPNAMELC}window.cpp
b/src/templates/C++/kde-frameworks6-simple/src/%{APPNAMELC}window.cpp
similarity index 100%
rename from src/templates/C++/kde-frameworks5-simple/src/%{APPNAMELC}window.cpp
rename to src/templates/C++/kde-frameworks6-simple/src/%{APPNAMELC}window.cpp
diff --git a/src/templates/C++/kde-frameworks5-simple/src/%{APPNAMELC}window.h
b/src/templates/C++/kde-frameworks6-simple/src/%{APPNAMELC}window.h
similarity index 100%
rename from src/templates/C++/kde-frameworks5-simple/src/%{APPNAMELC}window.h
rename to src/templates/C++/kde-frameworks6-simple/src/%{APPNAMELC}window.h
diff --git a/src/templates/C++/kde-frameworks5-simple/src/CMakeLists.txt
b/src/templates/C++/kde-frameworks6-simple/src/CMakeLists.txt
similarity index 89%
rename from src/templates/C++/kde-frameworks5-simple/src/CMakeLists.txt
rename to src/templates/C++/kde-frameworks6-simple/src/CMakeLists.txt
index 7ea6f5d4..3db5ca75 100644
--- a/src/templates/C++/kde-frameworks5-simple/src/CMakeLists.txt
+++ b/src/templates/C++/kde-frameworks6-simple/src/CMakeLists.txt
@@ -8,9 +8,9 @@ target_sources(%{APPNAMELC} PRIVATE
ki18n_wrap_ui(%{APPNAMELC} %{APPNAMELC}.ui)
target_link_libraries(%{APPNAMELC}
- KF5::CoreAddons
- KF5::I18n
- Qt5::Widgets
+ KF6::CoreAddons
+ KF6::I18n
+ Qt6::Widgets
)
install( TARGETS %{APPNAMELC} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
diff --git a/src/templates/C++/kde-frameworks5-simple/src/main.cpp
b/src/templates/C++/kde-frameworks6-simple/src/main.cpp
similarity index 100%
rename from src/templates/C++/kde-frameworks5-simple/src/main.cpp
rename to src/templates/C++/kde-frameworks6-simple/src/main.cpp
diff --git
a/src/templates/C++/kde-frameworks5-simple/src/org.example.%{APPNAMELC}.desktop
b/src/templates/C++/kde-frameworks6-simple/src/org.example.%{APPNAMELC}.desktop
similarity index 100%
rename from
src/templates/C++/kde-frameworks5-simple/src/org.example.%{APPNAMELC}.desktop
rename to
src/templates/C++/kde-frameworks6-simple/src/org.example.%{APPNAMELC}.desktop
diff --git
a/src/templates/C++/kde-frameworks5-simple/src/org.example.%{APPNAMELC}.metainfo.xml
b/src/templates/C++/kde-frameworks6-simple/src/org.example.%{APPNAMELC}.metainfo.xml
similarity index 82%
rename from
src/templates/C++/kde-frameworks5-simple/src/org.example.%{APPNAMELC}.metainfo.xml
rename to
src/templates/C++/kde-frameworks6-simple/src/org.example.%{APPNAMELC}.metainfo.xml
index dc9934cf..fc505e4f 100644
---
a/src/templates/C++/kde-frameworks5-simple/src/org.example.%{APPNAMELC}.metainfo.xml
+++
b/src/templates/C++/kde-frameworks6-simple/src/org.example.%{APPNAMELC}.metainfo.xml
@@ -21,10 +21,4 @@
</provides>
<launchable type="desktop-id">org.example.%{APPNAMELC}.desktop</launchable>
<project_group>KDE</project_group>
- <releases>
- <release version="0.1.23083" date="2023-11-09"/>
- <release version="0.1.23082" date="2023-10-12"/>
- <release version="0.1.23081" date="2023-09-14"/>
- <release version="0.1.23080" date="2023-08-24"/>
- </releases>
</component>
diff --git a/src/templates/C++/kde-frameworks5/CMakeLists.txt
b/src/templates/C++/kde-frameworks6/CMakeLists.txt
similarity index 68%
rename from src/templates/C++/kde-frameworks5/CMakeLists.txt
rename to src/templates/C++/kde-frameworks6/CMakeLists.txt
index 11161f41..0dc66bfb 100644
--- a/src/templates/C++/kde-frameworks5/CMakeLists.txt
+++ b/src/templates/C++/kde-frameworks6/CMakeLists.txt
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.16)
-project(%{APPNAMELC})
+project(%{APPNAMELC} VERSION %{VERSION})
-set(QT_MIN_VERSION "5.15.0")
-set(KF_MIN_VERSION "5.83.0")
+set(QT_MIN_VERSION "6.5.0")
+set(KF_MIN_VERSION "5.240.0")
-find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
+find_package(ECM ${KF_MIN_VERSION} REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(KDEInstallDirs)
@@ -16,9 +16,13 @@ include(ECMInstallIcons)
include(ECMQtDeclareLoggingCategory)
include(FeatureSummary)
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets)
+find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS
+ Core
+ Gui
+ Widgets
+)
-find_package(KF5 ${KF_MIN_VERSION} REQUIRED COMPONENTS
+find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS
ConfigWidgets
CoreAddons
Crash
diff --git a/src/templates/C++/kde-frameworks5/LICENSES/GFDL-1.2-or-later.txt
b/src/templates/C++/kde-frameworks6/LICENSES/GFDL-1.2-or-later.txt
similarity index 100%
rename from src/templates/C++/kde-frameworks5/LICENSES/GFDL-1.2-or-later.txt
rename to src/templates/C++/kde-frameworks6/LICENSES/GFDL-1.2-or-later.txt
diff --git a/src/templates/C++/kde-frameworks5/LICENSES/GPL-2.0-only.txt
b/src/templates/C++/kde-frameworks6/LICENSES/GPL-2.0-only.txt
similarity index 100%
rename from src/templates/C++/kde-frameworks5/LICENSES/GPL-2.0-only.txt
rename to src/templates/C++/kde-frameworks6/LICENSES/GPL-2.0-only.txt
diff --git a/src/templates/C++/kde-frameworks5/LICENSES/GPL-3.0-only.txt
b/src/templates/C++/kde-frameworks6/LICENSES/GPL-3.0-only.txt
similarity index 100%
rename from src/templates/C++/kde-frameworks5/LICENSES/GPL-3.0-only.txt
rename to src/templates/C++/kde-frameworks6/LICENSES/GPL-3.0-only.txt
diff --git
a/src/templates/C++/kde-frameworks5/LICENSES/LicenseRef-KDE-Accepted-GPL.txt
b/src/templates/C++/kde-frameworks6/LICENSES/LicenseRef-KDE-Accepted-GPL.txt
similarity index 100%
rename from
src/templates/C++/kde-frameworks5/LICENSES/LicenseRef-KDE-Accepted-GPL.txt
rename to
src/templates/C++/kde-frameworks6/LICENSES/LicenseRef-KDE-Accepted-GPL.txt
diff --git a/src/templates/C++/kde-frameworks5/Messages.sh
b/src/templates/C++/kde-frameworks6/Messages.sh
similarity index 100%
rename from src/templates/C++/kde-frameworks5/Messages.sh
rename to src/templates/C++/kde-frameworks6/Messages.sh
diff --git a/src/templates/C++/kde-frameworks5/README
b/src/templates/C++/kde-frameworks6/README
similarity index 100%
rename from src/templates/C++/kde-frameworks5/README
rename to src/templates/C++/kde-frameworks6/README
diff --git a/src/templates/C++/kde-frameworks5/doc/CMakeLists.txt
b/src/templates/C++/kde-frameworks6/doc/CMakeLists.txt
similarity index 100%
rename from src/templates/C++/kde-frameworks5/doc/CMakeLists.txt
rename to src/templates/C++/kde-frameworks6/doc/CMakeLists.txt
diff --git a/src/templates/C++/kde-frameworks5/doc/index.docbook
b/src/templates/C++/kde-frameworks6/doc/index.docbook
similarity index 99%
rename from src/templates/C++/kde-frameworks5/doc/index.docbook
rename to src/templates/C++/kde-frameworks6/doc/index.docbook
index 96c840c6..44d32fdf 100644
--- a/src/templates/C++/kde-frameworks5/doc/index.docbook
+++ b/src/templates/C++/kde-frameworks6/doc/index.docbook
@@ -483,7 +483,7 @@ application -->
<!--
List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport or kf5
+.Libraries or other software that is not included in kdesupport or KF6
.Hardware requirements like amount of RAM, disk space, graphics card
capabilities, screen resolution, special expansion cards, etc.
.Operating systems the app will run on. If your app is designed only for a
@@ -493,7 +493,7 @@ information here.
<para>
In order to successfully use &kmyapplication;, you need few libraries from
-&kf5; 5.1 (bar, baz). Foobar.lib is
+&kde-frameworks; 6.0 (bar, baz). Foobar.lib is
required in order to support the advanced &kmyapplication; features.
&kmyapplication; uses
about 5 megs of memory to run, but this may vary depending on your
platform and configuration.
diff --git a/src/templates/C++/kde-frameworks5/icons/16-apps-%{APPNAMELC}.png
b/src/templates/C++/kde-frameworks6/icons/16-apps-%{APPNAMELC}.png
similarity index 100%
rename from src/templates/C++/kde-frameworks5/icons/16-apps-%{APPNAMELC}.png
rename to src/templates/C++/kde-frameworks6/icons/16-apps-%{APPNAMELC}.png
diff --git a/src/templates/C++/kde-frameworks5/icons/22-apps-%{APPNAMELC}.png
b/src/templates/C++/kde-frameworks6/icons/22-apps-%{APPNAMELC}.png
similarity index 100%
rename from src/templates/C++/kde-frameworks5/icons/22-apps-%{APPNAMELC}.png
rename to src/templates/C++/kde-frameworks6/icons/22-apps-%{APPNAMELC}.png
diff --git a/src/templates/C++/kde-frameworks5/icons/32-apps-%{APPNAMELC}.png
b/src/templates/C++/kde-frameworks6/icons/32-apps-%{APPNAMELC}.png
similarity index 100%
rename from src/templates/C++/kde-frameworks5/icons/32-apps-%{APPNAMELC}.png
rename to src/templates/C++/kde-frameworks6/icons/32-apps-%{APPNAMELC}.png
diff --git a/src/templates/C++/kde-frameworks5/icons/48-apps-%{APPNAMELC}.png
b/src/templates/C++/kde-frameworks6/icons/48-apps-%{APPNAMELC}.png
similarity index 100%
rename from src/templates/C++/kde-frameworks5/icons/48-apps-%{APPNAMELC}.png
rename to src/templates/C++/kde-frameworks6/icons/48-apps-%{APPNAMELC}.png
diff --git a/src/templates/C++/kde-frameworks5/icons/CMakeLists.txt
b/src/templates/C++/kde-frameworks6/icons/CMakeLists.txt
similarity index 100%
rename from src/templates/C++/kde-frameworks5/icons/CMakeLists.txt
rename to src/templates/C++/kde-frameworks6/icons/CMakeLists.txt
diff --git a/src/templates/C++/kde-frameworks5/icons/sc-apps-%{APPNAMELC}.svgz
b/src/templates/C++/kde-frameworks6/icons/sc-apps-%{APPNAMELC}.svgz
similarity index 100%
rename from src/templates/C++/kde-frameworks5/icons/sc-apps-%{APPNAMELC}.svgz
rename to src/templates/C++/kde-frameworks6/icons/sc-apps-%{APPNAMELC}.svgz
diff --git a/src/templates/C++/kde-frameworks5/kde-frameworks5.kdevtemplate
b/src/templates/C++/kde-frameworks6/kde-frameworks6.kdevtemplate
similarity index 55%
rename from src/templates/C++/kde-frameworks5/kde-frameworks5.kdevtemplate
rename to src/templates/C++/kde-frameworks6/kde-frameworks6.kdevtemplate
index ab762647..295672f5 100644
--- a/src/templates/C++/kde-frameworks5/kde-frameworks5.kdevtemplate
+++ b/src/templates/C++/kde-frameworks6/kde-frameworks6.kdevtemplate
@@ -1,7 +1,6 @@
-# KDE Config File
[General]
Name=C++ KDE Frameworks
-Comment=A KDE Frameworks 5 GUI Application in C++
+Comment=A KDE Frameworks 6 GUI Application in C++
Category=Qt/Graphical
-Icon=kde-frameworks5.png
+Icon=kde-frameworks6.png
ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}window.cpp
diff --git a/src/templates/C++/kde-frameworks5/kde-frameworks5.png
b/src/templates/C++/kde-frameworks6/kde-frameworks6.png
similarity index 100%
rename from src/templates/C++/kde-frameworks5/kde-frameworks5.png
rename to src/templates/C++/kde-frameworks6/kde-frameworks6.png
diff --git a/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}ui.rc
b/src/templates/C++/kde-frameworks6/src/%{APPNAMELC}ui.rc
similarity index 100%
rename from src/templates/C++/kde-frameworks5/src/%{APPNAMELC}ui.rc
rename to src/templates/C++/kde-frameworks6/src/%{APPNAMELC}ui.rc
diff --git a/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}view.cpp
b/src/templates/C++/kde-frameworks6/src/%{APPNAMELC}view.cpp
similarity index 100%
rename from src/templates/C++/kde-frameworks5/src/%{APPNAMELC}view.cpp
rename to src/templates/C++/kde-frameworks6/src/%{APPNAMELC}view.cpp
diff --git a/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}view.h
b/src/templates/C++/kde-frameworks6/src/%{APPNAMELC}view.h
similarity index 100%
rename from src/templates/C++/kde-frameworks5/src/%{APPNAMELC}view.h
rename to src/templates/C++/kde-frameworks6/src/%{APPNAMELC}view.h
diff --git a/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}view.ui
b/src/templates/C++/kde-frameworks6/src/%{APPNAMELC}view.ui
similarity index 100%
rename from src/templates/C++/kde-frameworks5/src/%{APPNAMELC}view.ui
rename to src/templates/C++/kde-frameworks6/src/%{APPNAMELC}view.ui
diff --git a/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}window.cpp
b/src/templates/C++/kde-frameworks6/src/%{APPNAMELC}window.cpp
similarity index 100%
rename from src/templates/C++/kde-frameworks5/src/%{APPNAMELC}window.cpp
rename to src/templates/C++/kde-frameworks6/src/%{APPNAMELC}window.cpp
diff --git a/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}window.h
b/src/templates/C++/kde-frameworks6/src/%{APPNAMELC}window.h
similarity index 100%
rename from src/templates/C++/kde-frameworks5/src/%{APPNAMELC}window.h
rename to src/templates/C++/kde-frameworks6/src/%{APPNAMELC}window.h
diff --git a/src/templates/C++/kde-frameworks5/src/%{APPNAME}Settings.kcfg
b/src/templates/C++/kde-frameworks6/src/%{APPNAME}Settings.kcfg
similarity index 100%
rename from src/templates/C++/kde-frameworks5/src/%{APPNAME}Settings.kcfg
rename to src/templates/C++/kde-frameworks6/src/%{APPNAME}Settings.kcfg
diff --git a/src/templates/C++/kde-frameworks5/src/%{APPNAME}Settings.kcfgc
b/src/templates/C++/kde-frameworks6/src/%{APPNAME}Settings.kcfgc
similarity index 100%
rename from src/templates/C++/kde-frameworks5/src/%{APPNAME}Settings.kcfgc
rename to src/templates/C++/kde-frameworks6/src/%{APPNAME}Settings.kcfgc
diff --git a/src/templates/C++/kde-frameworks5/src/CMakeLists.txt
b/src/templates/C++/kde-frameworks6/src/CMakeLists.txt
similarity index 86%
rename from src/templates/C++/kde-frameworks5/src/CMakeLists.txt
rename to src/templates/C++/kde-frameworks6/src/CMakeLists.txt
index fe4ce3eb..d911fb9d 100644
--- a/src/templates/C++/kde-frameworks5/src/CMakeLists.txt
+++ b/src/templates/C++/kde-frameworks6/src/CMakeLists.txt
@@ -18,13 +18,13 @@ ki18n_wrap_ui(%{APPNAMELC}
)
target_link_libraries(%{APPNAMELC}
- KF5::CoreAddons
- KF5::I18n
- KF5::XmlGui
- KF5::ConfigWidgets
- KF5::DBusAddons
- KF5::Crash
- Qt5::Widgets
+ KF6::CoreAddons
+ KF6::I18n
+ KF6::XmlGui
+ KF6::ConfigWidgets
+ KF6::DBusAddons
+ KF6::Crash
+ Qt6::Widgets
)
install(TARGETS %{APPNAMELC} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/src/templates/C++/kde-frameworks5/src/main.cpp
b/src/templates/C++/kde-frameworks6/src/main.cpp
similarity index 100%
rename from src/templates/C++/kde-frameworks5/src/main.cpp
rename to src/templates/C++/kde-frameworks6/src/main.cpp
diff --git
a/src/templates/C++/kde-frameworks5/src/org.example.%{APPNAMELC}.desktop
b/src/templates/C++/kde-frameworks6/src/org.example.%{APPNAMELC}.desktop
similarity index 100%
rename from
src/templates/C++/kde-frameworks5/src/org.example.%{APPNAMELC}.desktop
rename to src/templates/C++/kde-frameworks6/src/org.example.%{APPNAMELC}.desktop
diff --git
a/src/templates/C++/kde-frameworks5/src/org.example.%{APPNAMELC}.metainfo.xml
b/src/templates/C++/kde-frameworks6/src/org.example.%{APPNAMELC}.metainfo.xml
similarity index 82%
rename from
src/templates/C++/kde-frameworks5/src/org.example.%{APPNAMELC}.metainfo.xml
rename to
src/templates/C++/kde-frameworks6/src/org.example.%{APPNAMELC}.metainfo.xml
index dc9934cf..fc505e4f 100644
---
a/src/templates/C++/kde-frameworks5/src/org.example.%{APPNAMELC}.metainfo.xml
+++
b/src/templates/C++/kde-frameworks6/src/org.example.%{APPNAMELC}.metainfo.xml
@@ -21,10 +21,4 @@
</provides>
<launchable type="desktop-id">org.example.%{APPNAMELC}.desktop</launchable>
<project_group>KDE</project_group>
- <releases>
- <release version="0.1.23083" date="2023-11-09"/>
- <release version="0.1.23082" date="2023-10-12"/>
- <release version="0.1.23081" date="2023-09-14"/>
- <release version="0.1.23080" date="2023-08-24"/>
- </releases>
</component>
diff --git a/src/templates/C++/kde-frameworks5/src/settings.ui
b/src/templates/C++/kde-frameworks6/src/settings.ui
similarity index 100%
rename from src/templates/C++/kde-frameworks5/src/settings.ui
rename to src/templates/C++/kde-frameworks6/src/settings.ui
