[pim/kdepim-runtime] /: remove qresync feature flag
Noham Devillers <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 738b42e57f76500fb02b82e3f47870c6ec2d5c92 by Noham Devillers.
Committed on 20/07/2026 at 14:13.
Pushed by ndevillers into branch 'master'.
remove qresync feature flag
M +0 -2 CMakeLists.txt
M +0 -1 config-kdepim-runtime.h.in
M +0 -4 resources/imap/autotests/testretrieveitemstask.cpp
M +0 -5 resources/imap/retrieveitemstask.cpp
https://invent.kde.org/pim/kdepim-runtime/-/commit/738b42e57f76500fb02b82e3f47870c6ec2d5c92
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ade7b801..300ef3337 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -267,8 +267,6 @@ if(TARGET KPim6::PimCommonActivities)
endif()
endif()
-option(QRESYNC_FEATURE_ENABLED "Enable the QRESYNC support in the IMAP resource" FALSE)
-
if(BUILD_TESTING)
add_definitions(-DBUILD_TESTING)
endif()
diff --git a/config-kdepim-runtime.h.in b/config-kdepim-runtime.h.in
index 958fb3b45..14ecbdd80 100644
--- a/config-kdepim-runtime.h.in
+++ b/config-kdepim-runtime.h.in
@@ -5,4 +5,3 @@
*/
#cmakedefine01 HAVE_ACTIVITY_SUPPORT
-#cmakedefine01 QRESYNC_FEATURE_ENABLED
diff --git a/resources/imap/autotests/testretrieveitemstask.cpp b/resources/imap/autotests/testretrieveitemstask.cpp
index c74e9aedc..49c1cbd6e 100644
--- a/resources/imap/autotests/testretrieveitemstask.cpp
+++ b/resources/imap/autotests/testretrieveitemstask.cpp
@@ -20,8 +20,6 @@
#include <QSignalSpy>
#include <QTest>
-#include "config-kdepim-runtime.h"
-
class TestRetrieveItemsTask : public ImapTestBase
{
Q_OBJECT
@@ -581,7 +579,6 @@ private Q_SLOTS:
QTest::newRow("missing uidnext") << collection << scenario << callNames;
-#if QRESYNC_FEATURE_ENABLED
// QRESYNC TESTS
collection = createCollectionChain(QStringLiteral("/INBOX/Foo"));
collection.attribute<UidValidityAttribute>(Akonadi::Collection::AddIfMissing)->setUidValidity(1149151135);
@@ -726,7 +723,6 @@ private Q_SLOTS:
<< QStringLiteral("itemsRetrievalDone");
QTest::newRow("qresync added, modified and vanished") << collection << scenario << callNames;
-#endif
}
void shouldIntrospectCollection()
diff --git a/resources/imap/retrieveitemstask.cpp b/resources/imap/retrieveitemstask.cpp
index 116833b44..d664658eb 100644
--- a/resources/imap/retrieveitemstask.cpp
+++ b/resources/imap/retrieveitemstask.cpp
@@ -20,7 +20,6 @@
#include <Akonadi/CollectionStatistics>
#include <Akonadi/MessageParts>
-#include "config-kdepim-runtime.h"
#include "imapresource_debug.h"
#include <KLocalizedString>
@@ -68,12 +67,8 @@ void RetrieveItemsTask::doStart(KIMAP::Session *session)
// check if we will use QRESYNC features or not for the SELECT commands
// it is useless to do a QRESYNC SELECT if we don't have current UIDValidity, UIDNEXT and HIGHESTMODSEQ cached already
-#if QRESYNC_FEATURE_ENABLED
m_qresyncSelect =
serverSupportsQresync() && col.hasAttribute<UidValidityAttribute>() && col.attribute<UidNextAttribute>() && col.hasAttribute<HighestModSeqAttribute>();
-#else
- m_qresyncSelect = false;
-#endif
startRetrievalTasks();
}