summaryrefslogtreecommitdiffstats
path: root/src/corelib/compat
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-01-26 09:09:53 +0100
committerMarc Mutz <marc.mutz@qt.io>2022-01-30 00:03:45 +0100
commit1ae5b3628d0858221542993331ede4c3ee7b3630 (patch)
tree4889c681305d22c1c353e8ba1e6af150ad829a51 /src/corelib/compat
parent9bfc8f348d39a3606847e2bc2e070bf7cdccc99e (diff)
QCalendar: replace two overloads with one QAnyStringView function
The backend was already ported, so this is just about applying QT_REMOVED_SINCE and updating the docs. Change-Id: I2c78908deb9cdb3cee19ce8bc148ab3117c1ad9a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/compat')
-rw-r--r--src/corelib/compat/removed_api.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp
index 231b03c317..d21813bbac 100644
--- a/src/corelib/compat/removed_api.cpp
+++ b/src/corelib/compat/removed_api.cpp
@@ -145,6 +145,14 @@ int QOperatingSystemVersion::compare(const QOperatingSystemVersion &v1,
#if QT_REMOVED_SINCE(6, 4)
+#include "qcalendar.h"
+
+QCalendar::QCalendar(QStringView name)
+ : QCalendar(QAnyStringView{name}) {}
+
+QCalendar::QCalendar(QLatin1String name)
+ : QCalendar(QAnyStringView{name}) {}
+
#include "qversionnumber.h"
QT_WARNING_PUSH