diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2022-02-02 15:18:06 +0100 |
|---|---|---|
| committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2022-02-03 18:31:44 +0100 |
| commit | 58c48b40d1142d2646bb0fd0d4234dee65498c3d (patch) | |
| tree | fdba1c8cd8b4141d71cb546a5266d44395ae30af /src/corelib/io/qurl.cpp | |
| parent | 6afa04f16c268d97d4d41a5420594aac1f20881f (diff) | |
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>
Diffstat (limited to 'src/corelib/io/qurl.cpp')
| -rw-r--r-- | src/corelib/io/qurl.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 33082498d1..08385c9629 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 |