From 58c48b40d1142d2646bb0fd0d4234dee65498c3d Mon Sep 17 00:00:00 2001
From: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
Date: Wed, 2 Feb 2022 15:18:06 +0100
Subject: [PATCH] QUrl: Use Q_CORE_REMOVED_SINCE instead of explicit version
 checks

Use Q_CORE_REMOVED_SINCE macro for fromAce()/toAce() API changes.

Pick-to: 6.3
Change-Id: I057c6d648c2141929f04e4b4c4a38ba3275261ab
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
---
 src/corelib/compat/removed_api.cpp | 12 ++++++++++++
 src/corelib/io/qurl.cpp            | 22 ----------------------
 src/corelib/io/qurl.h              |  9 +++------
 3 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp
index 6c0a3c853ee..df15a10c9ef 100644
--- a/src/corelib/compat/removed_api.cpp
+++ b/src/corelib/compat/removed_api.cpp
@@ -153,6 +153,18 @@ int QOperatingSystemVersion::compare(const QOperatingSystemVersion &v1,
     return QOperatingSystemVersionBase::compare(v1, v2);
 }
 
+#include "qurl.h"
+
+QString QUrl::fromAce(const QByteArray &domain)
+{
+    return fromAce(domain, {});
+}
+
+QByteArray QUrl::toAce(const QString &domain)
+{
+    return toAce(domain, {});
+}
+
 #endif // QT_CORE_REMOVED_SINCE(6, 3)
 
 #if QT_CORE_REMOVED_SINCE(6, 4)
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 33082498d13..08385c9629f 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -3061,17 +3061,6 @@ QString QUrl::fromAce(const QByteArray &domain, QUrl::AceProcessingOptions optio
                      ForbidLeadingDot /*FIXME: make configurable*/, options);
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
-/*!
-    \since 4.2
-    \overload
-*/
-QString QUrl::fromAce(const QByteArray &domain)
-{
-    return fromAce(domain, {});
-}
-#endif
-
 /*!
     \since 6.3
 
@@ -3095,17 +3084,6 @@ QByteArray QUrl::toAce(const QString &domain, AceProcessingOptions options)
             .toLatin1();
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
-/*!
-    \since 4.2
-    \overload
-*/
-QByteArray QUrl::toAce(const QString &domain)
-{
-    return toAce(domain, {});
-}
-#endif
-
 /*!
     \internal
 
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h
index 3001904ef31..db8693fb2ac 100644
--- a/src/corelib/io/qurl.h
+++ b/src/corelib/io/qurl.h
@@ -287,15 +287,12 @@ public:
     };
     Q_DECLARE_FLAGS(AceProcessingOptions, AceProcessingOption)
 
-#if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0)
-    static QString fromAce(const QByteArray &, AceProcessingOptions options = {});
-    static QByteArray toAce(const QString &, AceProcessingOptions options = {});
-#else
+#if QT_CORE_REMOVED_SINCE(6, 3)
     static QString fromAce(const QByteArray &);
     static QByteArray toAce(const QString &);
-    static QString fromAce(const QByteArray &, AceProcessingOptions options);
-    static QByteArray toAce(const QString &, AceProcessingOptions options);
 #endif
+    static QString fromAce(const QByteArray &domain, AceProcessingOptions options = {});
+    static QByteArray toAce(const QString &domain, AceProcessingOptions options = {});
 
     static QStringList idnWhitelist();
     static QStringList toStringList(const QList<QUrl> &uris, FormattingOptions options = FormattingOptions(PrettyDecoded));