[multimedia/amarok] /: Bump KF requirement to 6.6
Tuomas Nurmi <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 0357eae594fe6e181abddc18b1b0ae04abd6f9da by Tuomas Nurmi.
Committed on 30/07/2026 at 09:43.
Pushed by nurmi into branch 'master'.
Bump KF requirement to 6.6
KF 6.6 was released in September 2024, so should be OK.
Also remove usage of some small items deprecated in KF 6.6.
M +1 -1 CMakeLists.txt
M +2 -1 ChangeLog
M +1 -1 README
M +4 -3 src/TrayIcon.cpp
https://invent.kde.org/multimedia/amarok/-/commit/0357eae594fe6e181abddc18b1b0ae04abd6f9da
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2abf33d83d..9dcb929ed3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(Amarok)
###############
-set(KF_MIN_VERSION "6.5.0")
+set(KF_MIN_VERSION "6.6.0")
set(KF_MAJOR_VERSION "6")
set(QT_MIN_VERSION "6.7.0")
set(QT_MAJOR_VERSION "6")
diff --git a/ChangeLog b/ChangeLog
index 264a1c8b3c..9d73944efa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,10 +2,11 @@ Amarok ChangeLog
================
(C) 2002-2025 the Amarok authors.
-VERSION 3.3.4 UNRELEASED
+VERSION 3.3.81 UNRELEASED
FEATURES:
CHANGES:
+ * Amarok now depends on KDE Frameworks 6.6.
BUGFIXES:
* Fix shift-selecting multiple tracks in albums context applet
diff --git a/README b/README
index 9db5185dce..bde91aecbd 100644
--- a/README
+++ b/README
@@ -39,7 +39,7 @@ not be entirely up to date. You can always look at CMakeLists.txt to discover
the most recent dependencies.
Required
- * KDE Frameworks 6.5 (or newer, for an exact list look at CMakeLists.txt)
+ * KDE Frameworks 6.6 (or newer, for an exact list look at CMakeLists.txt)
https://www.kde.org
* GStreamer 1.10.0 (or newer)
diff --git a/src/TrayIcon.cpp b/src/TrayIcon.cpp
index d183b85ac5..b964ab793c 100644
--- a/src/TrayIcon.cpp
+++ b/src/TrayIcon.cpp
@@ -75,7 +75,7 @@ Amarok::TrayIcon::TrayIcon( QObject *parent )
contextMenu()->addAction( ac->action( QStringLiteral("next") ) );
m_separator = contextMenu()->addSeparator();
- contextMenu()->addActions( actionCollection() ); // quit and restore
+ contextMenu()->addActions( contextMenu()->actions() ); // quit and restore
contextMenu()->setObjectName( QStringLiteral("TrayIconContextMenu") );
@@ -307,7 +307,8 @@ Amarok::TrayIcon::updateMenu()
if( m_extraActions.count() > 0 )
{
// remove the 2 bottom items, so we can push them to the bottom again
- for( const auto action : actionCollection() )
+ const QList<QAction *> actions = contextMenu()->actions();
+ for( const auto action : actions )
contextMenu()->removeAction( action );
for( const auto action : m_extraActions )
@@ -315,7 +316,7 @@ Amarok::TrayIcon::updateMenu()
m_separator = contextMenu()->addSeparator();
// readd
- contextMenu()->addActions( actionCollection() );
+ contextMenu()->addActions( actions );
}
}