diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-03-08 15:54:33 +0100 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-03-09 20:37:10 +0000 |
| commit | e77dfcf843f3e59be923c9494583b2d20015960e (patch) | |
| tree | 2634f2f414a8393a7addeb9de2a4828de829b58d /src/corelib/text/qstring.h | |
| parent | f875ff5180345d9e50d594f3f432d5c73eef30e4 (diff) | |
Fix the ambiguity when calling QLatin1String(0)
This amends 736213bf662b68c4e80075cef317e5a029b490dd
Change-Id: I2fc16eba31898eb621866f8612bb7d26c95b5435
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/text/qstring.h')
| -rw-r--r-- | src/corelib/text/qstring.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h index 59ddcc1beb..7b494ec2e3 100644 --- a/src/corelib/text/qstring.h +++ b/src/corelib/text/qstring.h @@ -85,6 +85,7 @@ class QLatin1String { public: constexpr inline QLatin1String() noexcept : m_size(0), m_data(nullptr) {} + Q_WEAK_OVERLOAD constexpr QLatin1String(std::nullptr_t) noexcept : QLatin1String() {} constexpr inline explicit QLatin1String(const char *s) noexcept : m_size(s ? qsizetype(QtPrivate::lengthHelperPointer(s)) : 0), m_data(s) {} |