[pim/kdepim-runtime] resources/dav/resource: Use DavSslUiProxy only if KDAV is 6.29 or later
Kevin Ottens <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 6918b202057b3ad9128954095154276f658c9cbe by Kevin Ottens, on behalf of Kevin Ottens.
Committed on 29/07/2026 at 19:11.
Pushed by ervin into branch 'master'.
Use DavSslUiProxy only if KDAV is 6.29 or later
This is new API we cannot depend on it unconditionally.
M +6 -0 resources/dav/resource/davgroupwareresource.cpp
https://invent.kde.org/pim/kdepim-runtime/-/commit/6918b202057b3ad9128954095154276f658c9cbe
diff --git a/resources/dav/resource/davgroupwareresource.cpp b/resources/dav/resource/davgroupwareresource.cpp
index 3c4e2c011..98bd80f88 100644
--- a/resources/dav/resource/davgroupwareresource.cpp
+++ b/resources/dav/resource/davgroupwareresource.cpp
@@ -28,7 +28,9 @@
#include <KDAV/DavItemsFetchJob>
#include <KDAV/DavItemsListJob>
#include <KDAV/DavPrincipalHomesetsFetchJob>
+#if KDAV_VERSION >= QT_VERSION_CHECK(6, 29, 0)
#include <KDAV/DavSslUiProxy>
+#endif
#include <KDAV/ProtocolInfo>
#include <KCalendarCore/FreeBusy>
@@ -70,6 +72,7 @@ using IncidencePtr = QSharedPointer<KCalendarCore::Incidence>;
using namespace Qt::Literals::StringLiterals;
+#if KDAV_VERSION >= QT_VERSION_CHECK(6, 29, 0)
class SslUiProxy : public KDAV::DavSslUiProxy
{
public:
@@ -83,6 +86,7 @@ public:
}
}
};
+#endif
DavGroupwareResource::DavGroupwareResource(const QString &id)
: ResourceWidgetBase(id)
@@ -90,8 +94,10 @@ DavGroupwareResource::DavGroupwareResource(const QString &id)
, AccountBase(this)
, mFreeBusyHandler(new DavFreeBusyHandler(settings(), this))
{
+#if KDAV_VERSION >= QT_VERSION_CHECK(6, 29, 0)
auto proxy = std::make_unique<SslUiProxy>();
KDAV::DavSslUiProxy::setDefaultProxy(std::move(proxy));
+#endif
AttributeFactory::registerAttribute<DavProtocolAttribute>();
AttributeFactory::registerAttribute<CTagAttribute>();