diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-03-03 13:32:52 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-08 00:21:53 +0100 |
| commit | d1e2235553733876e97c2b65ef2e8d85889fa9ea (patch) | |
| tree | c015371bfd72307e84d04364d676dbc51b9b561a /src/corelib/doc | |
| parent | 7ef5a8528eea1419ef62dafa90b5174b48a04e6a (diff) | |
Revert the QByteArrayList addition to Qt 5.3
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 <jedrzej.nowacki@digia.com>
Diffstat (limited to 'src/corelib/doc')
| -rw-r--r-- | src/corelib/doc/snippets/qbytearraylist/main.cpp | 51 | ||||
| -rw-r--r-- | src/corelib/doc/snippets/qbytearraylist/qbytearraylist.pro | 2 |
2 files changed, 0 insertions, 53 deletions
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 <QByteArrayList> - -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 |