From 5ea4c3f148a5c293c5c5bb19866f8bfeabef7b38 Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 8 May 2012 12:23:42 +0200 Subject: Ensure qstring.h compiles with QT_NO_CAST_FROM_BYTEARRAY 19d160b72ba broke it temporarily, and this wasn't detected by tst_headersclean, because it sets QT_NO_CAST_FROM_ASCII too, which disabled the faulty code. So this adds a new unittest for QT_NO_CAST_FROM_BYTEARRAY alone. Change-Id: Iaf7a36a1378e77188bcc636e5dc9a1f9b84f70a7 Reviewed-by: Thiago Macieira Reviewed-by: Stephen Kelly --- .../qstring_no_cast_from_bytearray.pro | 6 +++ .../tst_qstring_no_cast_from_bytearray.cpp | 59 ++++++++++++++++++++++ tests/auto/corelib/tools/tools.pro | 1 + 3 files changed, 66 insertions(+) create mode 100644 tests/auto/corelib/tools/qstring_no_cast_from_bytearray/qstring_no_cast_from_bytearray.pro create mode 100644 tests/auto/corelib/tools/qstring_no_cast_from_bytearray/tst_qstring_no_cast_from_bytearray.cpp diff --git a/tests/auto/corelib/tools/qstring_no_cast_from_bytearray/qstring_no_cast_from_bytearray.pro b/tests/auto/corelib/tools/qstring_no_cast_from_bytearray/qstring_no_cast_from_bytearray.pro new file mode 100644 index 0000000000..e10c2c2a6d --- /dev/null +++ b/tests/auto/corelib/tools/qstring_no_cast_from_bytearray/qstring_no_cast_from_bytearray.pro @@ -0,0 +1,6 @@ +CONFIG += testcase parallel_test +TARGET = tst_qstring_no_cast_from_bytearray +QT = core testlib +SOURCES = tst_qstring_no_cast_from_bytearray.cpp +DEFINES += QT_NO_CAST_FROM_BYTEARRAY + diff --git a/tests/auto/corelib/tools/qstring_no_cast_from_bytearray/tst_qstring_no_cast_from_bytearray.cpp b/tests/auto/corelib/tools/qstring_no_cast_from_bytearray/tst_qstring_no_cast_from_bytearray.cpp new file mode 100644 index 0000000000..801f44ff62 --- /dev/null +++ b/tests/auto/corelib/tools/qstring_no_cast_from_bytearray/tst_qstring_no_cast_from_bytearray.cpp @@ -0,0 +1,59 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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, Nokia gives you certain additional +** rights. These rights are described in the Nokia 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +class tst_QString_NoCastFromByteArray: public QObject +{ + Q_OBJECT +private Q_SLOTS: + void initTestCase(); +}; + +void tst_QString_NoCastFromByteArray::initTestCase() +{ + QWARN("This is a compile test only"); +} + +QTEST_APPLESS_MAIN(tst_QString_NoCastFromByteArray) + +#include "tst_qstring_no_cast_from_bytearray.moc" diff --git a/tests/auto/corelib/tools/tools.pro b/tests/auto/corelib/tools/tools.pro index 38225e12f7..a8d0e6af61 100644 --- a/tests/auto/corelib/tools/tools.pro +++ b/tests/auto/corelib/tools/tools.pro @@ -36,6 +36,7 @@ SUBDIRS=\ qsizef \ qstl \ qstring \ + qstring_no_cast_from_bytearray \ qstringbuilder \ qstringlist \ qstringmatcher \ -- cgit v1.2.3