summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2012-10-04 14:31:29 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-11 02:47:36 +0200
commit191c0e300b8d625fa93939ecbff777469b816a44 (patch)
treeb4d84b017bc8dcaf39c8f8323d29e9cc85389458
parente3b7c23ec70f1471212b9eed8fea5f6fc3e24d98 (diff)
Fix a "warning: 'operator+=' is deprecated" when building with clang
Any file including qstringbuilder.h would trigger a warning when compiled with QT_ASCII_CAST_WARNINGS defined since it implicitely converts a QString to QByteArray. Explicitely call toUtf8() to fix the issue. Change-Id: If20f9d4571c5d1ed789564196c9f1331e1efd1d9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/tools/qstringbuilder.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h
index 69ae301cbf..a04910c228 100644
--- a/src/corelib/tools/qstringbuilder.h
+++ b/src/corelib/tools/qstringbuilder.h
@@ -403,8 +403,7 @@ QByteArray &appendToByteArray(QByteArray &a, const QStringBuilder<A, B> &b, char
template <typename A, typename B>
QByteArray &appendToByteArray(QByteArray &a, const QStringBuilder<A, B> &b, QChar)
{
- // append UTF-16 data to the byte array
- return a += QString(b);
+ return a += QString(b).toUtf8();
}
#endif
}