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 20:43:50 +0100 |
commit | c2f167b41284cee3570434deba85f26f14ff241f (patch) | |
tree | b0f52f86a8df266547d7ec7afa22d0c0d68d3532 /src/corelib/text/qstringbuilder.h | |
parent | 9f9049b486a47aef0c7e2e3852b20aa4ffdce748 (diff) | |
parent | ff922e7b87de147797fbd759167878aec7625f0c (diff) |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
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 45fd270b66..ae17dad9ac 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); } |