diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2012-03-27 12:27:54 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-29 23:26:34 +0200 |
| commit | d78fe5f8d361c203e43908ddc0bd64f667c83204 (patch) | |
| tree | 976025a3023b6d0f8027dea37fb8da5f11b4203f /tests/auto/corelib/tools/qarraydata | |
| parent | ca604b5b77a3f769c193774e07af2861b200d085 (diff) | |
Make QArrayData::shared_null zero terminated.
This is expected by QByteArray and QString
Change-Id: Ib668b144bdc0d2c793018c8f8d794f249eaf935c
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'tests/auto/corelib/tools/qarraydata')
| -rw-r--r-- | tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp index 9bfbac0017..4bd04f9bc3 100644 --- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp +++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp @@ -50,9 +50,9 @@ struct SharedNullVerifier { SharedNullVerifier() { - Q_ASSERT(QArrayData::shared_null.ref.isStatic()); - Q_ASSERT(QArrayData::shared_null.ref.isShared()); - Q_ASSERT(QArrayData::shared_null.ref.isSharable()); + Q_ASSERT(QArrayData::shared_null[0].ref.isStatic()); + Q_ASSERT(QArrayData::shared_null[0].ref.isShared()); + Q_ASSERT(QArrayData::shared_null[0].ref.isSharable()); } }; @@ -159,7 +159,7 @@ void tst_QArrayData::referenceCounting() void tst_QArrayData::sharedNullEmpty() { - QArrayData *null = const_cast<QArrayData *>(&QArrayData::shared_null); + QArrayData *null = const_cast<QArrayData *>(QArrayData::shared_null); QArrayData *empty = QArrayData::allocate(1, Q_ALIGNOF(QArrayData), 0); QVERIFY(null->ref.isStatic()); |