Merge branch 'master' into kf6

[dolphin.git] / .kde-ci.yml

diff --git a/.kde-ci.yml b/.kde-ci.yml
index 26a7a0fbb12f1006e1a5e48eb647a07b1c4a5945..28fcaac569b390d20bed36574ddc372f6bc9b2ae 100644 (file)
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -21,17 +21,21 @@ Dependencies:
     'frameworks/knotifications': '@latest-kf6'
     'frameworks/kcrash': '@latest-kf6'
     'frameworks/kwindowsystem': '@latest-kf6'
     'frameworks/knotifications': '@latest-kf6'
     'frameworks/kcrash': '@latest-kf6'
     'frameworks/kwindowsystem': '@latest-kf6'

-    'frameworks/kactivities': '@latest-kf6'

     'frameworks/kdoctools': '@latest-kf6'
     'frameworks/kwindowsystem': '@latest-kf6'
     'frameworks/kfilemetadata': '@latest-kf6'
     'frameworks/kcodecs': '@latest-kf6'
     'frameworks/kdoctools': '@latest-kf6'
     'frameworks/kwindowsystem': '@latest-kf6'
     'frameworks/kfilemetadata': '@latest-kf6'
     'frameworks/kcodecs': '@latest-kf6'

-    'libraries/kuserfeedback': '@latest-kf6'
+    'frameworks/kuserfeedback': '@latest-kf6'
+    'plasma/kactivities': '@latest-kf6'

     'libraries/phonon': '@latest-kf6'
     'libraries/kmoretools': '@latest-kf6'
 
 - 'on': ['Linux/Qt6', 'FreeBSD/Qt6']
   'require':
     'frameworks/baloo': '@latest-kf6'
     'libraries/phonon': '@latest-kf6'
     'libraries/kmoretools': '@latest-kf6'
 
 - 'on': ['Linux/Qt6', 'FreeBSD/Qt6']
   'require':
     'frameworks/baloo': '@latest-kf6'

-    'libraries/baloo-widgets': '@latest'
+    'libraries/baloo-widgets': '@latest-kf6'
+    'third-party/packagekit-qt': '@latest'

 
 

+- 'on': ['Linux/Qt6', 'Windows/Qt6', 'macOS/Qt6']
+  'require':
+    'network/kio-extras': '@latest-kf6'