diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-06 16:36:57 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-11 13:37:57 +0100 |
commit | 6dd9cc8aa8f85a00f1c6448eaf1382af23284195 (patch) | |
tree | 94e7d48767b2244182b5ff42f7a13d43d70b7fd0 | |
parent | 98b77f9faa14822479deb20cd6fe0ce4fe9b56da (diff) |
don't use testlib for headersclean test
this is a compile-only test, and it's not even marked as a testcase in
the autotest system.
Change-Id: I9b48ddad3c8e3e953d0e6fcfa010bab73289bc6f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r-- | tests/auto/other/headersclean/headersclean.pri | 1 | ||||
-rw-r--r-- | tests/auto/other/headersclean/tst_headersclean.cpp | 17 | ||||
-rw-r--r-- | tests/auto/other/headersclean/tst_headersclean.h | 61 |
3 files changed, 11 insertions, 68 deletions
diff --git a/tests/auto/other/headersclean/headersclean.pri b/tests/auto/other/headersclean/headersclean.pri index c95380e3b9..c56d432a42 100644 --- a/tests/auto/other/headersclean/headersclean.pri +++ b/tests/auto/other/headersclean/headersclean.pri @@ -34,7 +34,6 @@ QMAKE_CXXFLAGS += -DQT_NO_CAST_TO_ASCII \ TARGET = tst_headersclean SOURCES += $$PWD/tst_headersclean.cpp -HEADERS += $$PWD/tst_headersclean.h # qt_headersclean_headers.h should be alongside the .pro file INCLUDEPATH += $$_PRO_FILE_PWD_ diff --git a/tests/auto/other/headersclean/tst_headersclean.cpp b/tests/auto/other/headersclean/tst_headersclean.cpp index 01661a32ea..91abca4373 100644 --- a/tests/auto/other/headersclean/tst_headersclean.cpp +++ b/tests/auto/other/headersclean/tst_headersclean.cpp @@ -39,12 +39,17 @@ ** ****************************************************************************/ -#include "tst_headersclean.h" -#include <QTest> +#define signals int +#define slots int +#define emit public:; +#define foreach public:; +#define forever public:; -void tst_HeadersClean::initTestCase() +#include <qt_headersclean_headers.h> +#include <QtCore/qglobal.h> + +int main() { - QWARN("This is a compile test only"); + qWarning("This is a compile test only"); + return 0; } - -QTEST_MAIN(tst_HeadersClean) diff --git a/tests/auto/other/headersclean/tst_headersclean.h b/tests/auto/other/headersclean/tst_headersclean.h deleted file mode 100644 index 591689f424..0000000000 --- a/tests/auto/other/headersclean/tst_headersclean.h +++ /dev/null @@ -1,61 +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$ -** -****************************************************************************/ - -#ifndef TST_HEADERSCLEAN_H -#define TST_HEADERSCLEAN_H - -#define signals int -#define slots int -#define emit public:; -#define foreach public:; -#define forever public:; - -#include <qt_headersclean_headers.h> -#include <QObject> - -class tst_HeadersClean: public QObject -{ - Q_OBJECT -private Q_SLOTS: - void initTestCase(); -}; - -#endif |