Remove the Quick3DConfiguration Hack

Change-Id: If256d843c2a783fb617c0082f5bd1f15ef72ef19
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

3 files changed, 0 insertions, 190 deletions

diff --git a/src/quick3d/quick3d/items/items.pri b/src/quick3d/quick3d/items/items.pri
index 17668085e..4c5e93fb2 100644
--- a/src/quick3d/quick3d/items/items.pri
+++ b/src/quick3d/quick3d/items/items.pri
@@ -1,6 +1,5 @@
 HEADERS += \
     $$PWD/quick3dnodeinstantiator_p.h \
-    $$PWD/quick3dconfiguration_p.h \
     $$PWD/quick3dentity_p.h \
     $$PWD/quick3dentityloader_p_p.h \
     $$PWD/quick3dentityloader_p.h \
@@ -10,7 +9,6 @@ SOURCES += \
     $$PWD/quick3dnode.cpp \
     $$PWD/quick3dentity.cpp \
     $$PWD/quick3dentityloader.cpp \
-    $$PWD/quick3dconfiguration.cpp \
     $$PWD/quick3dnodeinstantiator.cpp
 
 INCLUDEPATH += $$PWD
diff --git a/src/quick3d/quick3d/items/quick3dconfiguration.cpp b/src/quick3d/quick3d/items/quick3dconfiguration.cpp
deleted file mode 100644
index 4b31e08c7..000000000
--- a/src/quick3d/quick3d/items/quick3dconfiguration.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 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 "quick3dconfiguration_p.h"
-#include <QDebug>
-
-#include <Qt3DCore/QAspectEngine>
-#include <Qt3DCore/QCamera>
-#include <Qt3DCore/private/qscene_p.h>
-#include <Qt3DCore/private/qnode_p.h>
-
-#include <Qt3DInput/QInputAspect>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-namespace Quick {
-
-/*!
-    \qmltype Configuration
-    \inqmlmodule Qt3D.Core
-    \since 5.5
-*/
-Quick3DConfiguration::Quick3DConfiguration(QObject *parent)
-    : QObject(parent)
-    , m_camera(Q_NULLPTR)
-{
-}
-
-void Quick3DConfiguration::setControlledCamera(QCamera *camera)
-{
-    if (m_camera != camera) {
-        m_camera = camera;
-        emit controlledCameraChanged();
-        QMetaObject::invokeMethod(this, "applyControlledCameraChange", Qt::QueuedConnection);
-    }
-}
-
-/*!
-    \qmlproperty Camera Qt3DCore::Configuration::controlledCamera
-*/
-QCamera *Quick3DConfiguration::controlledCamera() const
-{
-    return m_camera;
-}
-
-void Quick3DConfiguration::applyControlledCameraChange()
-{
-    QScene *scene = QNodePrivate::get(m_camera)->scene();
-
-    // Too early, let's try again later
-    if (!scene) {
-        QMetaObject::invokeMethod(this, "applyControlledCameraChange", Qt::QueuedConnection);
-        return;
-    }
-
-    Q_FOREACH (QAbstractAspect *aspect, scene->engine()->aspects()) {
-        if (aspect->property("camera").isValid()) {
-            aspect->setProperty("camera", QVariant::fromValue(m_camera));
-            break;
-        }
-    }
-}
-
-} // namespace Quick
-} // namespace Qt3DCore
-
-QT_END_NAMESPACE
diff --git a/src/quick3d/quick3d/items/quick3dconfiguration_p.h b/src/quick3d/quick3d/items/quick3dconfiguration_p.h
deleted file mode 100644
index 3b1c76aea..000000000
--- a/src/quick3d/quick3d/items/quick3dconfiguration_p.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 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 QT3D_QUICK_QUICK3DCONFIGURATION_P_H
-#define QT3D_QUICK_QUICK3DCONFIGURATION_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 <Qt3DQuick/private/qt3dquick_global_p.h>
-#include <QObject>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-class QCamera;
-
-namespace Quick {
-
-class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DConfiguration : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(Qt3DCore::QCamera *controlledCamera READ controlledCamera WRITE setControlledCamera NOTIFY controlledCameraChanged)
-public:
-    explicit Quick3DConfiguration(QObject *parent = 0);
-
-    void setControlledCamera(QCamera *camera);
-    QCamera *controlledCamera() const;
-
-Q_SIGNALS:
-    void controlledCameraChanged();
-
-private Q_SLOTS:
-    void applyControlledCameraChange();
-
-private:
-    QCamera *m_camera;
-};
-
-} // namespace Quick
-} // namespace Qt3DCore
-
-QT_END_NAMESPACE
-
-#endif // QT3D_QUICK_QUICK3DCONFIGURATION_P_H