diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
| commit | ff922e7b87de147797fbd759167878aec7625f0c (patch) | |
| tree | a326819f23e2421723f144522f9362ba608d6bb1 /src/corelib/text/qstringbuilder.h | |
| parent | e464e1eb8eb63c631fb0916c3ea4540a88d8aad3 (diff) | |
| parent | 75f52bd0ddc4afbd181c14b310d256e3507052d6 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/kernel/qmetatype.cpp
Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a
Diffstat (limited to 'src/corelib/text/qstringbuilder.h')
| -rw-r--r-- | src/corelib/text/qstringbuilder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/text/qstringbuilder.h b/src/corelib/text/qstringbuilder.h index 45fd270b662..ae17dad9ac2 100644 --- a/src/corelib/text/qstringbuilder.h +++ b/src/corelib/text/qstringbuilder.h @@ -126,8 +126,8 @@ private: } typedef QConcatenable<QStringBuilder<A, B> > Concatenable; - typedef typename Concatenable::ConvertTo ConvertTo; public: + typedef typename Concatenable::ConvertTo ConvertTo; operator ConvertTo() const { return convertTo<ConvertTo>(); } int size() const { return Concatenable::size(*this); } |