From 3e3a109ef20a889629937f41c0da7b3eeef74a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Tue, 25 Jan 2022 10:22:18 +0100 Subject: [PATCH] QLocale: Un-inline QString& constructor Because it's BiC. From the API review. Pick-to: 6.3 Change-Id: I69f1fe58428241a876ae9058e8a0108a8e496c22 Reviewed-by: Edward Welbourne Reviewed-by: Marc Mutz Reviewed-by: Thiago Macieira --- src/corelib/text/qlocale.cpp | 2 +- src/corelib/text/qlocale.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 4d859d32ee0..7571b649f0b 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -1022,9 +1022,9 @@ QLocale::QLocale(QStringView name) #if QT_STRINGVIEW_LEVEL < 2 /*! - \fn QLocale::QLocale(const QString &name) \overload */ +QLocale::QLocale(const QString &name) : QLocale(qToStringViewIgnoringNull(name)) {} #endif /*! diff --git a/src/corelib/text/qlocale.h b/src/corelib/text/qlocale.h index 5612d460d27..391857edfb7 100644 --- a/src/corelib/text/qlocale.h +++ b/src/corelib/text/qlocale.h @@ -928,7 +928,7 @@ public: QLocale(); #if QT_STRINGVIEW_LEVEL < 2 - explicit QLocale(const QString &name) : QLocale(qToStringViewIgnoringNull(name)) {} + explicit QLocale(const QString &name); #endif explicit QLocale(QStringView name); QLocale(Language language, Territory territory);