From fb37084b3e7c396cd10bf4d3253fee730320988a Mon Sep 17 00:00:00 2001
From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
Date: Tue, 8 Oct 2019 15:22:49 +0200
Subject: Use ECMGenerateExportHeader to manage deprecated API better

Summary:
Allows
* projects linking to KConfigCore/Gui to hide deprecated API up to a
  given version or silence deprecation warnings after a given version,
  using
  * -DKCONFIGCORE_DISABLE_DEPRECATED_BEFORE_AND_AT
  * -DKCONFIGCORE_NO_DEPRECATED
  * -DKCONFIGCORE_DEPRECATED_WARNINGS_SINCE
  * -DKCONFIGCORE_NO_DEPRECATED_WARNINGS
  * -DKCONFIGGUI_DISABLE_DEPRECATED_BEFORE_AND_AT
  * -DKCONFIGGUI_NO_DEPRECATED
  * -DKCONFIGGUI_DEPRECATED_WARNINGS_SINCE
  * -DKCONFIGGUI_NO_DEPRECATED_WARNINGS

  or
  * -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT
  * -DKF_NO_DEPRECATED
  * -DKF_DEPRECATED_WARNINGS_SINCE
  * -DKF_NO_DEPRECATED_WARNINGS
* to build KConfigCore/Gui optionally with deprecated API excluded from
  the build, using "EXCLUDE_DEPRECATED_BEFORE_AND_AT" cmake argument.

Test Plan:
Builds with EXCLUDE_DEPRECATED_BEFORE_AND_AT set to 0, 4.0.0, 5.0.0,
5.11.0, 5.24.0, 5.39.0, 5.42.0, CURRENT.

Reviewers: #frameworks, mlaurent

Reviewed By: mlaurent

Subscribers: mlaurent, kde-frameworks-devel

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D24496
---
 autotests/kconfigtest.cpp      | 4 ++--
 autotests/kdesktopfiletest.cpp | 2 +-
 autotests/kdesktopfiletest.h   | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'autotests')

diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp
index b915a07a..546568f8 100644
--- a/autotests/kconfigtest.cpp
+++ b/autotests/kconfigtest.cpp
@@ -748,7 +748,7 @@ void KConfigTest::testChangeGroup()
     KConfigGroup sc3(&sc, "Hello");
     QCOMPARE(sc3.name(), QString("Hello"));
     KConfigGroup newGroup(sc3);
-#ifndef KDE_NO_DEPRECATED
+#if KCONFIGCORE_ENABLE_DEPRECATED_SINCE(5, 0)
     newGroup.changeGroup("FooBar"); // deprecated!
     QCOMPARE(newGroup.name(), QString("FooBar"));
     QCOMPARE(sc3.name(), QString("Hello")); // unchanged
@@ -764,7 +764,7 @@ void KConfigTest::testChangeGroup()
     KConfigGroup sc32(rootGroup.group("Hello"));
     QCOMPARE(sc32.name(), QString("Hello"));
     KConfigGroup newGroup2(sc32);
-#ifndef KDE_NO_DEPRECATED
+#if KCONFIGCORE_ENABLE_DEPRECATED_SINCE(5, 0)
     newGroup2.changeGroup("FooBar"); // deprecated!
     QCOMPARE(newGroup2.name(), QString("FooBar"));
     QCOMPARE(sc32.name(), QString("Hello")); // unchanged
diff --git a/autotests/kdesktopfiletest.cpp b/autotests/kdesktopfiletest.cpp
index 4f8c5deb..ed13be8e 100644
--- a/autotests/kdesktopfiletest.cpp
+++ b/autotests/kdesktopfiletest.cpp
@@ -62,7 +62,7 @@ void KDesktopFileTest::testRead()
     QCOMPARE(df.fileName(), QFileInfo(fileName).canonicalFilePath());
 }
 
-#ifndef KDE_NO_DEPRECATED
+#if KCONFIGCORE_ENABLE_DEPRECATED_SINCE(5, 0)
 void KDesktopFileTest::testReadDirectory()
 {
     QTemporaryFile file("testReadDirectoryXXXXXX.directory");
diff --git a/autotests/kdesktopfiletest.h b/autotests/kdesktopfiletest.h
index 12385f4e..621c7934 100644
--- a/autotests/kdesktopfiletest.h
+++ b/autotests/kdesktopfiletest.h
@@ -20,6 +20,7 @@
 #define KDESKTOPFILETEST_H
 
 #include <QObject>
+#include <kconfigcore_export.h>
 
 class KDesktopFileTest : public QObject
 {
@@ -27,7 +28,9 @@ class KDesktopFileTest : public QObject
 private Q_SLOTS:
     void initTestCase();
     void testRead();
+#if KCONFIGCORE_ENABLE_DEPRECATED_SINCE(5, 0)
     void testReadDirectory();
+#endif
     void testReadLocalized_data();
     void testReadLocalized();
     void testUnsuccessfulTryExec();
-- 
cgit v1.2.1