From d1e2235553733876e97c2b65ef2e8d85889fa9ea Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 3 Mar 2014 13:32:52 -0800 Subject: Revert the QByteArrayList addition to Qt 5.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commits f12b0f9a38c792abb13f3e6ecff4542986a6f96b ("QByteArrayList: optimize op+"), f96f2fe3670bc8a32389795dc21b9839407465a1 ("Enable QByteArrayList tests"), and 4f23f0530a9c59400a7f3821cd2c9355801ed8cd ("new QByteArrayList class"). This class is coming back in Qt 5.4. [ChangeLog][CHANGELOG FIX] Remove the line about QByteArrayList being added. Change-Id: I890ab2b34a9b3e575512eb306d0f241143a867cf Reviewed-by: Jędrzej Nowacki --- src/corelib/doc/snippets/qbytearraylist/main.cpp | 51 ---- .../doc/snippets/qbytearraylist/qbytearraylist.pro | 2 - src/corelib/tools/qbytearraylist.cpp | 258 --------------------- src/corelib/tools/qbytearraylist.h | 124 ---------- src/corelib/tools/tools.pri | 2 - .../tools/qbytearraylist/qbytearraylist.pro | 4 - .../tools/qbytearraylist/tst_qbytearraylist.cpp | 223 ------------------ tests/auto/corelib/tools/tools.pro | 1 - 8 files changed, 665 deletions(-) delete mode 100644 src/corelib/doc/snippets/qbytearraylist/main.cpp delete mode 100644 src/corelib/doc/snippets/qbytearraylist/qbytearraylist.pro delete mode 100644 src/corelib/tools/qbytearraylist.cpp delete mode 100644 src/corelib/tools/qbytearraylist.h delete mode 100644 tests/auto/corelib/tools/qbytearraylist/qbytearraylist.pro delete mode 100644 tests/auto/corelib/tools/qbytearraylist/tst_qbytearraylist.cpp diff --git a/src/corelib/doc/snippets/qbytearraylist/main.cpp b/src/corelib/doc/snippets/qbytearraylist/main.cpp deleted file mode 100644 index 59f7af52e2..0000000000 --- a/src/corelib/doc/snippets/qbytearraylist/main.cpp +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 by Southwest Research Institute (R) -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include - -int main(int, char **) -{ - QByteArray ba1, ba2, ba3; -//! [0] - QByteArrayList longerList = (QByteArrayList() << ba1 << ba2 << ba3); -//! [0] -} diff --git a/src/corelib/doc/snippets/qbytearraylist/qbytearraylist.pro b/src/corelib/doc/snippets/qbytearraylist/qbytearraylist.pro deleted file mode 100644 index 87397b491d..0000000000 --- a/src/corelib/doc/snippets/qbytearraylist/qbytearraylist.pro +++ /dev/null @@ -1,2 +0,0 @@ -QT = core -SOURCES = main.cpp diff --git a/src/corelib/tools/qbytearraylist.cpp b/src/corelib/tools/qbytearraylist.cpp deleted file mode 100644 index 817342d682..0000000000 --- a/src/corelib/tools/qbytearraylist.cpp +++ /dev/null @@ -1,258 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 by Southwest Research Institute (R) -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -QT_BEGIN_NAMESPACE - -/*! \typedef QByteArrayListIterator - \relates QByteArrayList - - The QByteArrayListIterator type definition provides a Java-style const - iterator for QByteArrayList. - - QByteArrayList provides both \l{Java-style iterators} and - \l{STL-style iterators}. The Java-style const iterator is simply - a type definition for QListIterator. - - \sa QMutableByteArrayListIterator, QByteArrayList::const_iterator -*/ - -/*! \typedef QMutableByteArrayListIterator - \relates QByteArrayList - - The QByteArrayListIterator type definition provides a Java-style - non-const iterator for QByteArrayList. - - QByteArrayList provides both \l{Java-style iterators} and - \l{STL-style iterators}. The Java-style non-const iterator is - simply a type definition for QMutableListIterator. - - \sa QByteArrayListIterator, QByteArrayList::iterator -*/ - -/*! - \class QByteArrayList - \inmodule QtCore - \since 5.3 - \brief The QByteArrayList class provides a list of byte arrays. - - \ingroup tools - \ingroup shared - \ingroup string-processing - - \reentrant - - QByteArrayList inherits from QList. Like QList, QByteArrayList is - \l{implicitly shared}. It provides fast index-based access as well as fast - insertions and removals. Passing string lists as value parameters is both - fast and safe. - - All of QList's functionality also applies to QByteArrayList. For example, you - can use isEmpty() to test whether the list is empty, and you can call - functions like append(), prepend(), insert(), replace(), removeAll(), - removeAt(), removeFirst(), removeLast(), and removeOne() to modify a - QByteArrayList. In addition, QByteArrayList provides several join() - methods for concatenating the list into a single QByteArray. - - The purpose of QByteArrayList is quite different from that of QStringList. - Whereas QStringList has many methods for manipulation of elements within - the list, QByteArrayList does not. - Normally, QStringList should be used whenever working with a list of printable - strings. QByteArrayList should be used to handle and efficiently join large blobs - of binary data, as when sequentially receiving serialized data through a - QIODevice. - - \sa QByteArray, QStringList -*/ - -/*! - \fn QByteArrayList::QByteArrayList() - - Constructs an empty byte array list. -*/ - -/*! - \fn QByteArrayList::QByteArrayList(const QByteArray &ba) - - Constructs a byte array list that contains the given byte array, - \a ba. Longer lists are easily created like this: - - \snippet qbytearraylist/main.cpp 0 - - \sa append() -*/ - -/*! - \fn QByteArrayList::QByteArrayList(const QByteArrayList &other) - - Constructs a copy of the \a other byte array list. - - This operation takes \l{constant time} because QByteArrayList is - \l{implicitly shared}, making the process of returning a - QByteArrayList from a function very fast. If a shared instance is - modified, it will be copied (copy-on-write), and that takes - \l{linear time}. - - \sa operator=() -*/ - -/*! - \fn QByteArrayList::QByteArrayList(const QList &other) - - Constructs a copy of \a other. - - This operation takes \l{constant time}, because QByteArrayList is - \l{implicitly shared}. This makes returning a QByteArrayList from a - function very fast. If a shared instance is modified, it will be - copied (copy-on-write), and that takes \l{linear time}. - - \sa operator=() -*/ - -/*! \fn QByteArrayList::QByteArrayList(std::initializer_list args) - - Construct a list from a std::initializer_list given by \a args. - - This constructor is only enabled if the compiler supports C++11 initializer - lists. -*/ - -/*! - \fn QByteArray QByteArrayList::join() const - - Joins all the byte arrays into a single byte array. -*/ - -/*! - \fn QByteArray QByteArrayList::join(const QByteArray &separator) const - - Joins all the byte arrays into a single byte array with each - element separated by the given \a separator. -*/ - -int QByteArrayList_joinedSize(const QByteArrayList *that, int seplen) -{ - int totalLength = 0; - const int size = that->size(); - - for (int i = 0; i < size; ++i) - totalLength += that->at(i).size(); - - if (size > 0) - totalLength += seplen * (size - 1); - - return totalLength; -} - -/*! - \fn QByteArray QByteArrayList::join(char separator) const - - Joins all the byte arrays into a single byte array with each - element separated by the given \a separator. -*/ -QByteArray QtPrivate::QByteArrayList_join(const QByteArrayList *that, const char *sep, int seplen) -{ - int totalLength = QByteArrayList_joinedSize(that, seplen); - QByteArray res; - if (totalLength == 0) - return res; - res.reserve(totalLength); - for (int i = 0; i < that->size(); ++i) { - if (i) - res.append(sep, seplen); - res += that->at(i); - } - return res; -} - -/*! - \fn QByteArrayList operator+(const QByteArrayList &list1, const QByteArrayList &list2) - \relates QByteArrayList - - Returns a byte array list that is the concatenation of \a list1 and \a list2. -*/ - -/*! - \fn QByteArrayList& operator+=(QByteArrayList &list1, const QByteArrayList &list2) - \relates QByteArrayList - - Appends \a list2 to \a list1 and returns a reference to \a list1. -*/ - -/*! - \fn QByteArrayList &QByteArrayList::operator<<(const QByteArray &ba) - - Appends the given byte array, \a ba, to this byte array list and returns - a reference to the byte array list. - - \sa append() -*/ - -/*! - \fn QByteArrayList &QByteArrayList::operator<<(const QByteArrayList &other) - - \overload - - Appends the \a other byte array list to the byte array list and returns a reference to - the latter byte array list. -*/ - -/*! - \fn QDataStream &operator>>(QDataStream &in, QByteArrayList &list) - \relates QByteArrayList - - Reads a byte array list from the given \a in stream into the specified - \a list. - - \sa {Serializing Qt Data Types} -*/ - -/*! - \fn QDataStream &operator<<(QDataStream &out, const QByteArrayList &list) - \relates QByteArrayList - - Writes the given byte array \a list to the specified \a out stream. - - \sa {Serializing Qt Data Types} -*/ - -QT_END_NAMESPACE diff --git a/src/corelib/tools/qbytearraylist.h b/src/corelib/tools/qbytearraylist.h deleted file mode 100644 index 882bc68f09..0000000000 --- a/src/corelib/tools/qbytearraylist.h +++ /dev/null @@ -1,124 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 by Southwest Research Institute (R) -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef QBYTEARRAYLIST_H -#define QBYTEARRAYLIST_H - -#include -#include -#include - -QT_BEGIN_NAMESPACE - - -typedef QListIterator QByteArrayListIterator; -typedef QMutableListIterator QMutableByteArrayListIterator; - -class QByteArrayList : public QList -{ -public: - inline QByteArrayList() { } - inline explicit QByteArrayList(const QByteArray &i) { append(i); } - inline QByteArrayList(const QByteArrayList &l) : QList(l) { } - inline QByteArrayList(const QList &l) : QList(l) { } -#ifdef Q_COMPILER_INITIALIZER_LISTS - inline QByteArrayList(std::initializer_list args) : QList(args) { } -#endif - - inline QByteArray join() const; - inline QByteArray join(const QByteArray &sep) const; - inline QByteArray join(char sep) const; - - inline QByteArrayList &operator<<(const QByteArray &str) - { append(str); return *this; } - inline QByteArrayList &operator<<(const QByteArrayList &l) - { *this += l; return *this; } -}; - -Q_DECLARE_TYPEINFO(QByteArrayList, Q_MOVABLE_TYPE); - -namespace QtPrivate { - QByteArray Q_CORE_EXPORT QByteArrayList_join(const QByteArrayList *that, const char *s, int l); -} - -inline QByteArray QByteArrayList::join() const -{ - return QtPrivate::QByteArrayList_join(this, 0, 0); -} - -inline QByteArray QByteArrayList::join(const QByteArray &sep) const -{ - return QtPrivate::QByteArrayList_join(this, sep.constData(), sep.size()); -} - -inline QByteArray QByteArrayList::join(char sep) const -{ - return QtPrivate::QByteArrayList_join(this, &sep, 1); -} - -inline QByteArrayList operator+(const QByteArrayList &lhs, const QByteArrayList &rhs) -{ - QByteArrayList res = lhs; - res += rhs; - return res; -} - -inline QByteArrayList& operator+=(QByteArrayList &lhs, const QByteArrayList &rhs) -{ - lhs.append( rhs ); - return lhs; -} - -#ifndef QT_NO_DATASTREAM -inline QDataStream &operator>>(QDataStream &in, QByteArrayList &list) -{ - return operator>>(in, static_cast &>(list)); -} -inline QDataStream &operator<<(QDataStream &out, const QByteArrayList &list) -{ - return operator<<(out, static_cast &>(list)); -} -#endif // QT_NO_DATASTREAM - -QT_END_NAMESPACE - -#endif // QBYTEARRAYLIST_H diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 7a3dc9470c..863cf03439 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -9,7 +9,6 @@ HEADERS += \ tools/qarraydatapointer.h \ tools/qbitarray.h \ tools/qbytearray.h \ - tools/qbytearraylist.h \ tools/qbytearraymatcher.h \ tools/qbytedata_p.h \ tools/qcache.h \ @@ -78,7 +77,6 @@ SOURCES += \ tools/qarraydata.cpp \ tools/qbitarray.cpp \ tools/qbytearray.cpp \ - tools/qbytearraylist.cpp \ tools/qbytearraymatcher.cpp \ tools/qcollator.cpp \ tools/qcommandlineoption.cpp \ diff --git a/tests/auto/corelib/tools/qbytearraylist/qbytearraylist.pro b/tests/auto/corelib/tools/qbytearraylist/qbytearraylist.pro deleted file mode 100644 index 2cd4522f67..0000000000 --- a/tests/auto/corelib/tools/qbytearraylist/qbytearraylist.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase parallel_test -TARGET = tst_qbytearraylist -QT = core testlib -SOURCES = tst_qbytearraylist.cpp diff --git a/tests/auto/corelib/tools/qbytearraylist/tst_qbytearraylist.cpp b/tests/auto/corelib/tools/qbytearraylist/tst_qbytearraylist.cpp deleted file mode 100644 index 86a56abae3..0000000000 --- a/tests/auto/corelib/tools/qbytearraylist/tst_qbytearraylist.cpp +++ /dev/null @@ -1,223 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 by Southwest Research Institute (R) -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -#include - -Q_DECLARE_METATYPE(QByteArrayList) - -class tst_QByteArrayList : public QObject -{ - Q_OBJECT -private slots: - void join() const; - void join_data() const; - void joinByteArray() const; - void joinByteArray_data() const; - void joinChar() const; - void joinChar_data() const; - void joinEmptiness() const; - - void operator_plus() const; - void operator_plus_data() const; - - void initializeList() const; -}; - -void tst_QByteArrayList::join() const -{ - QFETCH(QByteArrayList, input); - QFETCH(QByteArray, expectedResult); - - QCOMPARE(input.join(), expectedResult); -} - -void tst_QByteArrayList::join_data() const -{ - QTest::addColumn("input"); - QTest::addColumn("expectedResult"); - - QTest::newRow("data1") << QByteArrayList() - << QByteArray(); - - QTest::newRow("data2") << QByteArrayList("one") - << QByteArray("one"); - - QTest::newRow("data3") << (QByteArrayList() << "a" << "b") - << QByteArray("ab"); - - QTest::newRow("data4") << (QByteArrayList() << "a" << "b" << "c") - << QByteArray("abc"); -} - -void tst_QByteArrayList::joinByteArray() const -{ - QFETCH(QByteArrayList, input); - QFETCH(QByteArray, separator); - QFETCH(QByteArray, expectedResult); - - QCOMPARE(input.join(separator), expectedResult); -} - -void tst_QByteArrayList::joinByteArray_data() const -{ - QTest::addColumn("input"); - QTest::addColumn("separator"); - QTest::addColumn("expectedResult"); - - QTest::newRow("data1") << QByteArrayList() - << QByteArray() - << QByteArray(); - - QTest::newRow("data2") << QByteArrayList() - << QByteArray("separator") - << QByteArray(); - - QTest::newRow("data3") << QByteArrayList("one") - << QByteArray("separator") - << QByteArray("one"); - - QTest::newRow("data4") << (QByteArrayList() << "a" << "b") - << QByteArray(" ") - << QByteArray("a b"); - - QTest::newRow("data5") << (QByteArrayList() << "a" << "b" << "c") - << QByteArray(" ") - << QByteArray("a b c"); - - QTest::newRow("data6") << (QByteArrayList() << "a" << "b" << "c") - << QByteArray() - << QByteArray("abc"); - - QTest::newRow("data7") << (QByteArrayList() << "a" << "b" << "c") - << QByteArray("") //empty - << QByteArray("abc"); -} - -void tst_QByteArrayList::joinChar() const -{ - QFETCH(QByteArrayList, input); - QFETCH(char, separator); - QFETCH(QByteArray, expectedResult); - - QCOMPARE(input.join(separator), expectedResult); -} - -void tst_QByteArrayList::joinChar_data() const -{ - QTest::addColumn("input"); - QTest::addColumn("separator"); - QTest::addColumn("expectedResult"); - - QTest::newRow("data1") << QByteArrayList() - << ' ' - << QByteArray(); - - QTest::newRow("data2") << (QByteArrayList() << "a" << "b") - << ' ' - << QByteArray("a b"); - - QTest::newRow("data3") << (QByteArrayList() << "a" << "b" << "c") - << ' ' - << QByteArray("a b c"); -} - -void tst_QByteArrayList::joinEmptiness() const -{ - QByteArrayList list; - QByteArray string = list.join(QByteArray()); - - QVERIFY(string.isEmpty()); - QVERIFY(string.isNull()); -} - -void tst_QByteArrayList::operator_plus() const -{ - QFETCH(QByteArrayList, a1); - QFETCH(QByteArrayList, a2); - QFETCH(QByteArrayList, expectedResult); - - QCOMPARE(a1+a2, expectedResult); - a1 += a2; - QCOMPARE(a1, expectedResult); -} - -void tst_QByteArrayList::operator_plus_data() const -{ - QTest::addColumn("a1"); - QTest::addColumn("a2"); - QTest::addColumn("expectedResult"); - - QTest::newRow("simpl") << ( QByteArrayList() << "a" ) - << ( QByteArrayList() << "b" << "c" ) - << ( QByteArrayList() << "a" << "b" << "c" ); - - QTest::newRow("blank1") << QByteArrayList() - << QByteArrayList() - << QByteArrayList(); - - QTest::newRow("blank2") << ( QByteArrayList() ) - << ( QByteArrayList() << "b" << "c" ) - << ( QByteArrayList() << "b" << "c" ); - - QTest::newRow("empty1") << ( QByteArrayList() << "" ) - << ( QByteArrayList() << "b" << "c" ) - << ( QByteArrayList() << "" << "b" << "c" ); - - QTest::newRow("empty2") << ( QByteArrayList() << "a" ) - << ( QByteArrayList() << "" << "c" ) - << ( QByteArrayList() << "a" << "" << "c" ); -} - -void tst_QByteArrayList::initializeList() const -{ -#ifdef Q_COMPILER_INITIALIZER_LISTS - // C++11 support is required - QByteArrayList v1{QByteArray("hello"),"world",QByteArray("plop")}; - QCOMPARE(v1, (QByteArrayList() << "hello" << "world" << "plop")); - QCOMPARE(v1, (QByteArrayList{"hello","world","plop"})); -#endif -} - -QTEST_APPLESS_MAIN(tst_QByteArrayList) -#include "tst_qbytearraylist.moc" diff --git a/tests/auto/corelib/tools/tools.pro b/tests/auto/corelib/tools/tools.pro index d5c9e50190..1ef8e77071 100644 --- a/tests/auto/corelib/tools/tools.pro +++ b/tests/auto/corelib/tools/tools.pro @@ -5,7 +5,6 @@ SUBDIRS=\ qarraydata_strictiterators \ qbitarray \ qbytearray \ - qbytearraylist \ qbytearraymatcher \ qbytedatabuffer \ qcache \ -- cgit v1.2.3