From: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Date: Tue, 24 Apr 2012 08:35:45 +0000 (+0200)
Subject: Use macro for QByteArrayData initialization.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=7e9fa5ad9c1786d8be5a422f94a44b2cd836aca6;p=konrad%2Fqtdeclarative.git

Use macro for QByteArrayData initialization.

Change-Id: I6fc09c69ddd7eba588950cbdaeff4002fcc00ef5
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
---

diff --git a/src/qml/qml/ftw/qfastmetabuilder_p.h b/src/qml/qml/ftw/qfastmetabuilder_p.h
index 16f7b6e..aebafc8 100644
--- a/src/qml/qml/ftw/qfastmetabuilder_p.h
+++ b/src/qml/qml/ftw/qfastmetabuilder_p.h
@@ -222,7 +222,7 @@ void QFastMetaBuilder::StringRef::loadByteArrayData()
     int offsetofCstrings = _b->m_stringCount * sizeof(QByteArrayData);
     qptrdiff offset = offsetofCstrings + _o - _i * sizeof(QByteArrayData);
 
-    const QByteArrayData bad = { Q_REFCOUNT_INITIALIZE_STATIC, _l, 0, 0, offset };
+    const QByteArrayData bad = Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(_l, offset);
     memcpy(&_b->m_stringData[_i], &bad, sizeof(QByteArrayData));
 
     ++_b->m_stringCountLoaded;