diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-03 21:40:20 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-13 13:52:01 +0100 |
commit | df02fdde5f312e5470e86d6e556c6de01dd8255b (patch) | |
tree | fa3dfab7e08d89ef7f2eef7244b4afce66f0cb1b | |
parent | e223e439a89959184a33144632eec2d67d5462f9 (diff) |
make use of qt_headersclean.prf
Change-Id: I8efef39364a2d2c92cbcfab766831241013abba3
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
-rw-r--r-- | tests/auto/headersclean/headersclean.pro | 8 | ||||
-rw-r--r-- | tests/auto/headersclean/qt_headersclean_headers.h | 52 |
2 files changed, 2 insertions, 58 deletions
diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro index 1132890d..117379e7 100644 --- a/tests/auto/headersclean/headersclean.pro +++ b/tests/auto/headersclean/headersclean.pro @@ -1,6 +1,2 @@ -QT = core testlib jsondb -HEADERSCLEAN_PRI = $${QT.core.sources}/../../tests/auto/other/headersclean/headersclean.pri -isEmpty(QT.core.sources)|!include($$HEADERSCLEAN_PRI) { - warning("headersclean.pri from QtCore sources not available. test disabled") - TEMPLATE=subdirs -} +QT = jsondb +load(qt_headersclean) diff --git a/tests/auto/headersclean/qt_headersclean_headers.h b/tests/auto/headersclean/qt_headersclean_headers.h deleted file mode 100644 index fca7db18..00000000 --- a/tests/auto/headersclean/qt_headersclean_headers.h +++ /dev/null @@ -1,52 +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 QT_HEADERSCLEAN_HEADERS -#define QT_HEADERSCLEAN_HEADERS - -/* - This file should include all the headers to be tested by the headersclean - test. It may be copied and customized for each module. -*/ - -#include <QtJsonDb/QtJsonDb> - -#endif |