From 01e7cf44c221a0d215e30ad27ba47f5058260961 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 21 Nov 2023 15:22:09 +0100 Subject: [PATCH] [libcalamares] Placeholder for KF6 automount DBus calls --- src/libcalamares/partition/AutoMount.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/libcalamares/partition/AutoMount.cpp b/src/libcalamares/partition/AutoMount.cpp index 7e1040a28..1f17e3173 100644 --- a/src/libcalamares/partition/AutoMount.cpp +++ b/src/libcalamares/partition/AutoMount.cpp @@ -42,8 +42,15 @@ struct AutoMountInfo static inline QDBusMessage kdedCall( const QString& method ) { +#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) return QDBusMessage::createMethodCall( QStringLiteral( "org.kde.kded5" ), QStringLiteral( "/kded" ), QStringLiteral( "org.kde.kded5" ), method ); +#else +#warning KF6 Automount-handling is untested + // This is definitely wrong until Plasma6 is released, and somebody tests it + return QDBusMessage::createMethodCall( + QStringLiteral( "org.kde.kded6" ), QStringLiteral( "/kded" ), QStringLiteral( "org.kde.kded6" ), method ); +#endif } /** @brief Log a response from call()