From d4258bc2385f8ad3284b009b768c16f12e357a3b Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Tue, 20 Mar 2012 16:43:53 -0700 Subject: QLatin1String: Suppress MSVC warnning. Change-Id: I61ab71549799a5af8cce85e334245642a266c3c8 Reviewed-by: Stephen Kelly --- src/corelib/tools/qstring.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index fa5ef3bbf0..042d80bea5 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -666,7 +666,7 @@ class QLatin1String public: Q_DECL_CONSTEXPR inline explicit QLatin1String(const char *s) : m_size(s ? int(strlen(s)) : 0), m_data(s) {} Q_DECL_CONSTEXPR inline explicit QLatin1String(const char *s, int sz) : m_size(sz), m_data(s) {} - inline explicit QLatin1String(const QByteArray &s) : m_size(strlen(s.constData())), m_data(s.constData()) {} + inline explicit QLatin1String(const QByteArray &s) : m_size(int(strlen(s.constData()))), m_data(s.constData()) {} inline const char *latin1() const { return m_data; } inline int size() const { return m_size; } -- cgit v1.2.3