Introduce initializer macros for QString- and QByteArrayData

This enables easier updating of those structs, by reducing the amount of
code that needs to be fixed. The common (and known) use cases are
covered by the two macros being introduced in each case.

Change-Id: I44981ca9b9b034f99238a11797b30bb85471cfb7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/stringbuilder.cpp b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/stringbuilder.cpp
index 429652d92d..862789cc73 100644
--- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/stringbuilder.cpp
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/stringbuilder.cpp
@@ -109,7 +109,7 @@ void runScenario()
 
     {
         static const QStaticStringData<12> literalData = {
-                { Q_REFCOUNT_INITIALIZE_STATIC, 12, 0, 0, sizeof(QStringData) },
+                Q_STATIC_STRING_DATA_HEADER_INITIALIZER(12),
                 { 's', 'o', 'm', 'e', ' ', 'l', 'i', 't', 'e', 'r', 'a', 'l' }
             };
         static QStringDataPtr literal = { literalData.data_ptr() };
@@ -228,7 +228,7 @@ void runScenario()
 
     {
         static const QStaticByteArrayData<12> literalData = {
-                { Q_REFCOUNT_INITIALIZE_STATIC, 12, 0, 0, sizeof(QByteArrayData) },
+                Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER(12),
                 { 's', 'o', 'm', 'e', ' ', 'l', 'i', 't', 'e', 'r', 'a', 'l' }
             };
         static QByteArrayDataPtr literal = { literalData.data_ptr() };