summaryrefslogtreecommitdiffstats
path: root/tests/auto/render/commons
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2016-08-25 12:42:43 +0200
committerSean Harmer <sean.harmer@kdab.com>2016-11-18 18:45:07 +0000
commit079a6d40ec13cc522bb0b78c0f521e49ce258a53 (patch)
treea76115946f47aed656b876794a789b7738977444 /tests/auto/render/commons
parentab64b7ea8d134edd912e1b5a2fbb854463289c9d (diff)
Tests: move TestArbiter into core common
As it doesn't make sense to have it in render when mutliple submodules need that for their tests Change-Id: I853ca15a87051e4f63bfd7a24dae5e82014589b8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests/auto/render/commons')
-rw-r--r--tests/auto/render/commons/commons.pri2
-rw-r--r--tests/auto/render/commons/testpostmanarbiter.cpp85
-rw-r--r--tests/auto/render/commons/testpostmanarbiter.h75
3 files changed, 0 insertions, 162 deletions
diff --git a/tests/auto/render/commons/commons.pri b/tests/auto/render/commons/commons.pri
index 54bc0b949..1364ddb32 100644
--- a/tests/auto/render/commons/commons.pri
+++ b/tests/auto/render/commons/commons.pri
@@ -1,9 +1,7 @@
SOURCES += \
- $$PWD/testpostmanarbiter.cpp \
$$PWD/testrenderer.cpp
HEADERS += \
- $$PWD/testpostmanarbiter.h \
$$PWD/testrenderer.h
INCLUDEPATH += $$PWD
diff --git a/tests/auto/render/commons/testpostmanarbiter.cpp b/tests/auto/render/commons/testpostmanarbiter.cpp
deleted file mode 100644
index 6c3ca025b..000000000
--- a/tests/auto/render/commons/testpostmanarbiter.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** 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 https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "testpostmanarbiter.h"
-#include <Qt3DCore/private/qnode_p.h>
-
-QT_BEGIN_NAMESPACE
-
-TestPostman::TestPostman(TestArbiter *arbiter)
- : m_arbiter(arbiter)
-{}
-
-void TestPostman::setScene(Qt3DCore::QScene *)
-{}
-
-void TestPostman::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &)
-{}
-
-void TestPostman::notifyBackend(const Qt3DCore::QSceneChangePtr &e)
-{
- m_arbiter->sceneChangeEventWithLock(e);
-}
-
-TestArbiter::TestArbiter()
- : m_postman(new TestPostman(this))
-{
-}
-
-TestArbiter::~TestArbiter()
-{
-}
-
-void TestArbiter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
-{
- events.push_back(e);
-}
-
-void TestArbiter::sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e)
-{
- events.push_back(e);
-}
-
-void TestArbiter::sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e)
-{
- events += QVector<Qt3DCore::QSceneChangePtr>::fromStdVector(e);
-}
-
-Qt3DCore::QAbstractPostman *TestArbiter::postman() const
-{
- return m_postman;
-}
-
-void TestArbiter::setArbiterOnNode(Qt3DCore::QNode *node)
-{
- Qt3DCore::QNodePrivate::get(node)->setArbiter(this);
- Q_FOREACH (Qt3DCore::QNode *n, node->childNodes())
- setArbiterOnNode(n);
-}
-
-QT_END_NAMESPACE
diff --git a/tests/auto/render/commons/testpostmanarbiter.h b/tests/auto/render/commons/testpostmanarbiter.h
deleted file mode 100644
index cb2b87afd..000000000
--- a/tests/auto/render/commons/testpostmanarbiter.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** 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 https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <Qt3DCore/private/qpostman_p.h>
-#include <Qt3DCore/private/qchangearbiter_p.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
- class QNode;
-} // Qt3D
-
-class TestArbiter;
-
-class TestPostman : public Qt3DCore::QAbstractPostman
-{
-public:
- explicit TestPostman(TestArbiter *arbiter);
- void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_FINAL;
- void setScene(Qt3DCore::QScene *) Q_DECL_FINAL;
- void notifyBackend(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
-
-private:
- TestArbiter *m_arbiter;
-};
-
-class TestArbiter : public Qt3DCore::QAbstractArbiter
-{
-public:
- TestArbiter();
- ~TestArbiter();
-
- void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
-
- void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
-
- void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) Q_DECL_FINAL;
-
- Qt3DCore::QAbstractPostman *postman() const Q_DECL_FINAL;
-
- QVector<Qt3DCore::QSceneChangePtr> events;
-
- void setArbiterOnNode(Qt3DCore::QNode *node);
-
-private:
- TestPostman *m_postman;
-};
-
-QT_END_NAMESPACE