diff options
author | Mike Krus <mike.krus@kdab.com> | 2020-03-10 13:08:33 +0000 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2020-03-10 13:32:02 +0000 |
commit | c0180adbf8149b8641b612a34083d60ba1ac1e2d (patch) | |
tree | f8ea54dfcc3de890e4028a5bd6e6f848b68acfb2 /tests | |
parent | 037d833f7d99e5cf8a92595acf633356f8d663d7 (diff) |
Remove unused test lib which is causing CI to fail
Change-Id: I17f30741fe539d02f8d225ef36303f38730f8794
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/auto.pro | 7 | ||||
-rw-r--r-- | tests/auto/coretest/coretest.pro | 19 | ||||
-rw-r--r-- | tests/auto/coretest/qbackendnodetester.cpp | 58 | ||||
-rw-r--r-- | tests/auto/coretest/qbackendnodetester_p.h | 75 |
4 files changed, 0 insertions, 159 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 971edcb39..5c1060a7c 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,7 +1,6 @@ TEMPLATE = subdirs SUBDIRS = \ - coretest \ core \ cmake \ global @@ -17,9 +16,3 @@ qtConfig(qt3d-render) { SUBDIRS += geometryloaders qtConfig(qt3d-input): SUBDIRS += quick3d } - -for(subdir, SUBDIRS) { - !equals(subdir, coretest) { - $${subdir}.depends += coretest - } -} diff --git a/tests/auto/coretest/coretest.pro b/tests/auto/coretest/coretest.pro deleted file mode 100644 index 57c7a0f0b..000000000 --- a/tests/auto/coretest/coretest.pro +++ /dev/null @@ -1,19 +0,0 @@ -TARGET = Qt3DCoreTest -MODULE = 3dcoretest -CONFIG += static internal_module - -DEFINES += QT_NO_CAST_FROM_ASCII -PRECOMPILED_HEADER = -INCLUDEPATH += $$PWD - -qtConfig(private_tests) { - SOURCES += \ - $$PWD/qbackendnodetester.cpp - - HEADERS += \ - $$PWD/qbackendnodetester_p.h -} - -QT += core-private 3dcore 3dcore-private - -load(qt_module) diff --git a/tests/auto/coretest/qbackendnodetester.cpp b/tests/auto/coretest/qbackendnodetester.cpp deleted file mode 100644 index e0c2511fb..000000000 --- a/tests/auto/coretest/qbackendnodetester.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qbackendnodetester_p.h" -#include <Qt3DCore/qbackendnode.h> -#include <Qt3DCore/qnode.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3DCore { - -QBackendNodeTester::QBackendNodeTester(QObject *parent) - : QObject(parent) -{ -} - -void QBackendNodeTester::setPeerId(QBackendNode *backend, QNodeId id) -{ - Q_ASSERT(backend); - backend->setPeerId(id); -} - -} // namespace Qt3DCore - -QT_END_NAMESPACE diff --git a/tests/auto/coretest/qbackendnodetester_p.h b/tests/auto/coretest/qbackendnodetester_p.h deleted file mode 100644 index 910b87b4a..000000000 --- a/tests/auto/coretest/qbackendnodetester_p.h +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3DCORE_QBACKENDNODETESTER_P_H -#define QT3DCORE_QBACKENDNODETESTER_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of other Qt classes. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <QObject> -#include <Qt3DCore/qnodeid.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3DCore { - -class QBackendNode; -class QNode; - -class QBackendNodeTester : public QObject -{ - Q_OBJECT -public: - explicit QBackendNodeTester(QObject *parent = 0); - - // Proxies to allow test classes to call private methods on QBackendNode - void setPeerId(QBackendNode *backend, QNodeId id); -}; - -} // namespace Qt3DCore - -QT_END_NAMESPACE - -#endif // QT3DCORE_QBACKENDNODETESTER_P_H |