From 09348c3efbfbb5713a8648988f42c2b6dc309508 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 16 Mar 2012 17:59:43 +0100 Subject: [PATCH] Compile QLatin1String with C++11 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit qstring.h: In constructor ‘QLatin1String::QLatin1String(const QByteArray&)’: qstring.h:667:129: error: ‘const char* QByteArray::constData() const’ is not ‘constexpr’ QByteArray has a destructor and therefore cannot be used in constexpr, so do not mark it as constexpr Change-Id: I037e9ae73a244660923eac791cc3e0082d1d7a63 Reviewed-by: Thiago Macieira --- 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 de5cd2c..781afc5 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -664,7 +664,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) {} - Q_DECL_CONSTEXPR inline explicit QLatin1String(const QByteArray &s) : m_size(strlen(s.constData())), m_data(s.constData()) {} + inline explicit QLatin1String(const QByteArray &s) : m_size(strlen(s.constData())), m_data(s.constData()) {} inline const char *latin1() const { return m_data; } inline int size() const { return m_size; } -- 2.7.4