summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-12-06 17:23:34 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-12 09:22:49 +0100
commit06129361aaf53e29125c0774865643f3f70c5456 (patch)
tree2b0fd4e8db29c85d634f31f36f9ce82af4227d44
parent6eff4c3b26d92b51ed15e1341c3e57a5fbe47c04 (diff)
make use of qt_headersclean.prfv5.0.0-rc2
Change-Id: I0256b34290c3f281ab51141d84795f3514cb832d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--tests/auto/headersclean/headersclean.pro9
-rw-r--r--tests/auto/headersclean/tst_headersclean.cpp66
2 files changed, 2 insertions, 73 deletions
diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro
index 77a7645..4c6c350 100644
--- a/tests/auto/headersclean/headersclean.pro
+++ b/tests/auto/headersclean/headersclean.pro
@@ -1,8 +1,3 @@
-TARGET = tst_headersclean
-CONFIG += testcase
-SOURCES += tst_headersclean.cpp
-QT = core testlib
-
-contains(QT_CONFIG,script): QT += script
-contains(QT_CONFIG,scripttools): QT += scripttools
+QT = script scripttools
+load(qt_headersclean)
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/headersclean/tst_headersclean.cpp b/tests/auto/headersclean/tst_headersclean.cpp
deleted file mode 100644
index facfa55..0000000
--- a/tests/auto/headersclean/tst_headersclean.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the test suite 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$
-**
-****************************************************************************/
-
-#define QT_NO_KEYWORDS
-#define signals int
-#define slots int
-#define emit public:;
-#define foreach public:;
-#define forever public:;
-
-#include <QtCore/QtCore>
-#include <QtTest/QtTest>
-
-#include <QtScript/QtScript>
-
-#ifdef QT_SCRIPTTOOLS_LIB
-# include <QtScriptTools/QtScriptTools>
-#endif
-
-class tst_HeadersClean: public QObject
-{
- Q_OBJECT
-public:
- tst_HeadersClean() {}
-};
-
-QTEST_MAIN(tst_HeadersClean)
-#include "tst_headersclean.moc"