diff options
author | David Faure <faure@kde.org> | 2012-05-15 13:04:39 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-16 19:37:33 +0200 |
commit | 348c3966a02fd3abd5b172859ae5be04c548cf8a (patch) | |
tree | 5ddabe36bf8b9fec2c96736980aec9aeafd8a538 | |
parent | 7701d8dc64afadb2378a53297ecd5132de84d81b (diff) |
Add header qtest_widgets.h, similar to qtest_gui.h, but for QApplication.
The current alternative is to define QT_WIDGETS_LIB before including
qtest.h, but this is not convenient/intuitive when using other build
systems than qmake. If one forgets the define, crashes happen when
using QApplication-related code.
Use <QTestWidgets> in one of the widgets autotests, for testing.
Change-Id: Id96be4976723aea3e8a28c9d0d594daab25a6d90
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
-rw-r--r-- | src/testlib/qtest_widgets.h | 61 | ||||
-rw-r--r-- | tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp | 2 |
2 files changed, 62 insertions, 1 deletions
diff --git a/src/testlib/qtest_widgets.h b/src/testlib/qtest_widgets.h new file mode 100644 index 0000000000..5e3aa3210f --- /dev/null +++ b/src/testlib/qtest_widgets.h @@ -0,0 +1,61 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtTest module 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$ +** +****************************************************************************/ + +#ifndef QTEST_WIDGETS_H +#define QTEST_WIDGETS_H + +// enable WIDGETS features +#ifndef QT_WIDGETS_LIB +#define QT_WIDGETS_LIB +#endif +#if 0 +#pragma qt_class(QtTestWidgets) +#endif + +#include <qtest_gui.h> + +#if 0 +// inform syncqt +#pragma qt_no_master_include +#endif + +#endif + diff --git a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp index a888a9f984..1b0de0ee38 100644 --- a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp +++ b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QtTest/QtTestWidgets> #include <QtWidgets/qdesktopwidget.h> #include <QtWidgets/qgraphicseffect.h> #include <QtWidgets/qgraphicsview.h> |