QQmlExtensionPlugins for Qt3DCore and Qt3DRenderer

Quick3D components for core and renderer have been moved to their own module.
For each module, a QQmlExtensionPlugin has been created and is installed in
qtbase/qml/Qt3D/.

To use the Qml API, 3dquick needs to added in the .pro.
3dquickrenderer can be added if subclassing Quick3D elements defined in
Renderer. Otherwise, appending it is not necessary as the Qml engine will
automatically load the QQmlExtensionPlugin.

Core has no more reference to the QML module. Qt3DRenderer still has
references to the QML module which will be remove in follow up patches.

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

15 files changed, 3 insertions, 919 deletions

diff --git a/src/render/backend/rendereraspect.cpp b/src/render/backend/rendereraspect.cpp
index 68079742c..9d63c9f68 100644
--- a/src/render/backend/rendereraspect.cpp
+++ b/src/render/backend/rendereraspect.cpp
@@ -55,29 +55,6 @@
 #include <QThread>
 #include <QWindow>
 
-#include <QtQml>
-
-#include "scene.h"
-#include "effect.h"
-#include "technique.h"
-#include "tag.h"
-#include "mesh.h"
-#include "material.h"
-#include "renderpass.h"
-#include "shaderprogram.h"
-#include "viewport.h"
-#include "quick3dcameraselector.h"
-#include "quick3dtechniquefilter.h"
-#include "quick3dviewport.h"
-#include "quick3drenderpassfilter.h"
-#include "quick3drendertargetselector.h"
-#include "renderpassfilter.h"
-#include "techniquefilter.h"
-#include "rendertargetselector.h"
-#include "shape.h"
-#include "texture.h"
-#include "framegraph.h"
-
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
@@ -175,26 +152,6 @@ void RendererAspect::cleanupHelper()
  */
 void RendererAspect::registerQmlComponents()
 {
-    qmlRegisterType<Qt3D::Scene>("Qt3D.Render", 2, 0, "Scene");
-    qmlRegisterType<Qt3D::Effect>("Qt3D.Render", 2, 0, "Effect");
-    qmlRegisterType<Qt3D::Technique>("Qt3D.Render", 2, 0, "Technique");
-    qmlRegisterType<Qt3D::Tag>("Qt3D.Render", 2, 0, "Tag");
-    qmlRegisterType<Qt3D::Mesh>("Qt3D.Render", 2, 0, "Mesh");
-    qmlRegisterType<Qt3D::Material>("Qt3D.Render", 2, 0, "Material");
-    qmlRegisterType<Qt3D::RenderPass>("Qt3D.Render", 2, 0, "RenderPass");
-    qmlRegisterType<Qt3D::ShaderProgram>("Qt3D.Render", 2, 0, "ShaderProgram");
-
-    qmlRegisterType<Qt3D::Shape>("Qt3D.Render", 2, 0, "Shape");
-    qmlRegisterType<Qt3D::QmlTexture>("Qt3D.Render", 2, 0, "Texture");
-
-    // Framegraph components - TODO RenderTarget, RenderTargetSelector
-    qmlRegisterType<Qt3D::Quick::Quick3DCameraSelector>("Qt3D.Render", 2, 0, "CameraSelector");
-    qmlRegisterType<Qt3D::Quick::Quick3DRenderPassFilter>("Qt3D.Render", 2, 0, "RenderPassFilter");
-    qmlRegisterType<Qt3D::Quick::Quick3DTechniqueFilter>("Qt3D.Render", 2, 0, "TechniqueFilter");
-    qmlRegisterType<Qt3D::Quick::Quick3DViewport>("Qt3D.Render", 2, 0, "Viewport");
-//    qmlRegisterType<Qt3D::FrameGraphItem>("Qt3D.Render", 2, 0, "FrameGraphNode");
-    qmlRegisterType<Qt3D::Quick::Quick3DRenderTargetSelector>("Qt3D.Render", 2, 0, "RenderTargetSelector");
-    qmlRegisterType<Qt3D::FrameGraph>("Qt3D.Render", 2, 0, "FrameGraph");
 }
 
 }
diff --git a/src/render/frontend/quick3dcameraselector.cpp b/src/render/frontend/quick3dcameraselector.cpp
deleted file mode 100644
index 8fa8f2804..000000000
--- a/src/render/frontend/quick3dcameraselector.cpp
+++ /dev/null
@@ -1,60 +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: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$
-**
-****************************************************************************/
-
-#include "quick3dcameraselector.h"
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3D {
-
-namespace Quick {
-
-Quick3DCameraSelector::Quick3DCameraSelector(Node *parent)
-    : CameraSelector()
-    , Quick3DFrameGraphItem(parent)
-{
-}
-
-} // Quick
-
-} // Qt3D
-
-QT_END_NAMESPACE
diff --git a/src/render/frontend/quick3dcameraselector.h b/src/render/frontend/quick3dcameraselector.h
deleted file mode 100644
index 3c80bdb9c..000000000
--- a/src/render/frontend/quick3dcameraselector.h
+++ /dev/null
@@ -1,72 +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: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 QT3D_QUICK_QUICK3DCAMERASELECTOR_H
-#define QT3D_QUICK_QUICK3DCAMERASELECTOR_H
-
-#include <Qt3DRenderer/quick3dframegraphitem.h>
-#include <Qt3DRenderer/cameraselector.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3D {
-
-namespace Quick {
-
-class Quick3DCameraSelector : public Quick3DFrameGraphItem, public virtual CameraSelector
-{
-    Q_OBJECT
-    Q_INTERFACES(Qt3D::CameraSelector)
-    Q_PROPERTY(Qt3D::Node *camera READ camera WRITE setCamera NOTIFY cameraChanged)
-public:
-    Quick3DCameraSelector(Node *parent = 0);
-Q_SIGNALS:
-    void cameraChanged() Q_DECL_OVERRIDE;
-    void enabledChanged() Q_DECL_OVERRIDE;
-};
-
-} // Quick
-
-} // Qt3D
-
-QT_END_NAMESPACE
-
-#endif // QUICK3DCAMERASELECTOR_H
diff --git a/src/render/frontend/quick3dframegraphitem.cpp b/src/render/frontend/quick3dframegraphitem.cpp
deleted file mode 100644
index 42003274d..000000000
--- a/src/render/frontend/quick3dframegraphitem.cpp
+++ /dev/null
@@ -1,65 +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: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$
-**
-****************************************************************************/
-
-#include "quick3dframegraphitem.h"
-#include "framegraphitem_p.h"
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3D {
-
-namespace Quick {
-
-Quick3DFrameGraphItem::Quick3DFrameGraphItem(Node *parent)
-    : Quick3DNode(parent)
-    , FrameGraphItem()
-{
-}
-
-Quick3DFrameGraphItem::~Quick3DFrameGraphItem()
-{
-}
-
-} // Quick
-
-} // Qt3D
-
-QT_END_NAMESPACE
diff --git a/src/render/frontend/quick3dframegraphitem.h b/src/render/frontend/quick3dframegraphitem.h
deleted file mode 100644
index 220a74a26..000000000
--- a/src/render/frontend/quick3dframegraphitem.h
+++ /dev/null
@@ -1,77 +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: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 QT3D_QUICK_QUICK3DFRAMEGRAPHITEM_H
-#define QT3D_QUICK_QUICK3DFRAMEGRAPHITEM_H
-
-#include <Qt3DCore/quick3dnode.h>
-#include <Qt3DRenderer/framegraphitem.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3D {
-
-class FrameGraphItemPrivate;
-
-namespace Quick {
-
-class Quick3DFrameGraphItem : public Quick3DNode, public FrameGraphItem
-{
-    Q_OBJECT
-    Q_INTERFACES(Qt3D::FrameGraphItem)
-    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged)
-
-public:
-    explicit Quick3DFrameGraphItem(Node *parent = 0);
-    virtual ~Quick3DFrameGraphItem();
-
-
-Q_SIGNALS:
-    void enabledChanged() Q_DECL_OVERRIDE;
-};
-
-} // Quick
-
-} // Qt3D
-
-QT_END_NAMESPACE
-
-#endif // QT3D_QUICK_QUICK3DFRAMEGRAPHITEM_H
diff --git a/src/render/frontend/quick3drenderpassfilter.cpp b/src/render/frontend/quick3drenderpassfilter.cpp
deleted file mode 100644
index 23dcf4784..000000000
--- a/src/render/frontend/quick3drenderpassfilter.cpp
+++ /dev/null
@@ -1,60 +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: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$
-**
-****************************************************************************/
-
-#include "quick3drenderpassfilter.h"
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3D {
-
-namespace Quick {
-
-Quick3DRenderPassFilter::Quick3DRenderPassFilter(Node *parent)
-    : RenderPassFilter()
-    , Quick3DFrameGraphItem(parent)
-{
-}
-
-} // Quick
-
-} // Qt3D
-
-QT_END_NAMESPACE
diff --git a/src/render/frontend/quick3drenderpassfilter.h b/src/render/frontend/quick3drenderpassfilter.h
deleted file mode 100644
index b925582fb..000000000
--- a/src/render/frontend/quick3drenderpassfilter.h
+++ /dev/null
@@ -1,74 +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: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 QT3D_QUICK_QUICK3DRENDERPASSFILTER_H
-#define QT3D_QUICK_QUICK3DRENDERPASSFILTER_H
-
-#include <Qt3DRenderer/quick3dframegraphitem.h>
-#include <Qt3DRenderer/renderpassfilter.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3D {
-
-namespace Quick {
-
-class Quick3DRenderPassFilter : public Quick3DFrameGraphItem, public virtual RenderPassFilter
-{
-    Q_OBJECT
-    Q_INTERFACES(Qt3D::RenderPassFilter)
-    Q_PROPERTY(QString renderPassName READ renderPassName WRITE setRenderPassName NOTIFY renderPassNameChanged)
-
-public:
-    Quick3DRenderPassFilter(Node *parent = 0);
-
-Q_SIGNALS:
-    void renderPassNameChanged() Q_DECL_OVERRIDE;
-    void enabledChanged() Q_DECL_OVERRIDE;
-};
-
-} // Quick
-
-} // Qt3D
-
-QT_END_NAMESPACE
-
-#endif // QT3D_QUICK_QUICK3DRENDERPASSFILTER_H
diff --git a/src/render/frontend/quick3drendertargetselector.cpp b/src/render/frontend/quick3drendertargetselector.cpp
deleted file mode 100644
index f0aa1df95..000000000
--- a/src/render/frontend/quick3drendertargetselector.cpp
+++ /dev/null
@@ -1,60 +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: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$
-**
-****************************************************************************/
-
-#include "quick3drendertargetselector.h"
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3D {
-
-namespace Quick {
-
-Quick3DRenderTargetSelector::Quick3DRenderTargetSelector(Node * parent)
-    : RenderTargetSelector()
-    , Quick3DFrameGraphItem(parent)
-{
-}
-
-} // Quick
-
-} // Qt3D
-
-QT_END_NAMESPACE
diff --git a/src/render/frontend/quick3drendertargetselector.h b/src/render/frontend/quick3drendertargetselector.h
deleted file mode 100644
index ca24e7736..000000000
--- a/src/render/frontend/quick3drendertargetselector.h
+++ /dev/null
@@ -1,71 +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: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 QT3D_QUICK_QUICK3DRENDERTARGETSELECTOR_H
-#define QT3D_QUICK_QUICK3DRENDERTARGETSELECTOR_H
-
-#include <Qt3DRenderer/quick3dframegraphitem.h>
-#include <Qt3DRenderer/rendertargetselector.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3D {
-
-namespace Quick {
-
-class Quick3DRenderTargetSelector : public Quick3DFrameGraphItem, public virtual RenderTargetSelector
-{
-    Q_OBJECT
-    Q_INTERFACES(Qt3D::RenderTargetSelector)
-public:
-    explicit Quick3DRenderTargetSelector(Node *parent = 0);
-
-Q_SIGNALS:
-    void enabledChanged() Q_DECL_OVERRIDE;
-};
-
-} // Quick
-
-} // Qt3D
-
-QT_END_NAMESPACE
-
-#endif // QT3D_QUICK_QUICK3DRENDERTARGETSELECTOR_H
diff --git a/src/render/frontend/quick3dtechniquefilter.cpp b/src/render/frontend/quick3dtechniquefilter.cpp
deleted file mode 100644
index a05ed33a0..000000000
--- a/src/render/frontend/quick3dtechniquefilter.cpp
+++ /dev/null
@@ -1,103 +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: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$
-**
-****************************************************************************/
-
-#include "quick3dtechniquefilter.h"
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3D {
-
-namespace Quick {
-
-Quick3DTechniqueFilter::Quick3DTechniqueFilter(Node *parent)
-    : TechniqueFilter()
-    , Quick3DFrameGraphItem(parent)
-{
-}
-
-QQmlListProperty<Qt3D::Tag> Quick3DTechniqueFilter::tagList()
-{
-    return QQmlListProperty<Qt3D::Tag>(this, 0,
-                                       &Quick3DTechniqueFilter::appendTag,
-                                       &Quick3DTechniqueFilter::tagCount,
-                                       &Quick3DTechniqueFilter::tagAt,
-                                       &Quick3DTechniqueFilter::clearTags);
-}
-
-void Quick3DTechniqueFilter::appendTag(QQmlListProperty<Tag> *list, Tag *tag)
-{
-    Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
-    if (filter) {
-        tag->setParent(filter);
-        filter->addTag(tag);
-    }
-}
-
-Tag *Quick3DTechniqueFilter::tagAt(QQmlListProperty<Tag> *list, int index)
-{
-    TechniqueFilter *filter = qobject_cast<TechniqueFilter *>(list->object);
-    if (filter)
-        return filter->tags().at(index);
-    return 0;
-}
-
-int Quick3DTechniqueFilter::tagCount(QQmlListProperty<Tag> *list)
-{
-    TechniqueFilter *filter = qobject_cast<TechniqueFilter *>(list->object);
-    if (filter)
-        return filter->tags().size();
-    return 0;
-}
-
-void Quick3DTechniqueFilter::clearTags(QQmlListProperty<Tag> *list)
-{
-    TechniqueFilter *filter = qobject_cast<TechniqueFilter *>(list->object);
-    if (filter) {
-        Q_FOREACH (Tag *tag, filter->tags())
-            filter->removeTag(tag);
-    }
-}
-
-} // Quick
-
-} // Qt3D
-
-QT_END_NAMESPACE
diff --git a/src/render/frontend/quick3dtechniquefilter.h b/src/render/frontend/quick3dtechniquefilter.h
deleted file mode 100644
index 8e943a291..000000000
--- a/src/render/frontend/quick3dtechniquefilter.h
+++ /dev/null
@@ -1,85 +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: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 QT3D_QUICK_QUICK3DTECHNIQUEFILTER_H
-#define QT3D_QUICK_QUICK3DTECHNIQUEFILTER_H
-
-#include <Qt3DRenderer/quick3dframegraphitem.h>
-#include <Qt3DRenderer/techniquefilter.h>
-#include <QQmlListProperty>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3D {
-
-class TechniqueFilterPrivate;
-
-namespace Quick {
-
-class Quick3DTechniqueFilter : public Quick3DFrameGraphItem, public virtual TechniqueFilter
-{
-    Q_OBJECT
-    Q_INTERFACES(Qt3D::TechniqueFilter)
-    Q_PROPERTY(QQmlListProperty<Qt3D::Tag> tags READ tagList)
-
-public:
-    explicit Quick3DTechniqueFilter(Node *parent = 0);
-    QQmlListProperty<Qt3D::Tag> tagList();
-
-Q_SIGNALS:
-    void tagsChanged() Q_DECL_OVERRIDE;
-    void enabledChanged() Q_DECL_OVERRIDE;
-
-private:
-    static void appendTag(QQmlListProperty<Tag> *list, Tag *bar);
-    static Tag *tagAt(QQmlListProperty<Tag> *list, int index);
-    static int tagCount(QQmlListProperty<Tag> *list);
-    static void clearTags(QQmlListProperty<Tag> *list);
-
-};
-
-} // Quick
-
-} // Qt3D
-
-QT_END_NAMESPACE
-
-#endif // QT3D_QUICK_QUICK3DTECHNIQUEFILTER_H
diff --git a/src/render/frontend/quick3dviewport.cpp b/src/render/frontend/quick3dviewport.cpp
deleted file mode 100644
index afdb9abea..000000000
--- a/src/render/frontend/quick3dviewport.cpp
+++ /dev/null
@@ -1,60 +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: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$
-**
-****************************************************************************/
-
-#include "quick3dviewport.h"
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3D {
-
-namespace Quick {
-
-Quick3DViewport::Quick3DViewport(Node *parent)
-    : Viewport()
-    , Quick3DFrameGraphItem(parent)
-{
-}
-
-} // Quick
-
-} // Qt3D
-
-QT_END_NAMESPACE
diff --git a/src/render/frontend/quick3dviewport.h b/src/render/frontend/quick3dviewport.h
deleted file mode 100644
index 2833c0d25..000000000
--- a/src/render/frontend/quick3dviewport.h
+++ /dev/null
@@ -1,74 +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: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 QT3D_QUICK_QUICK3DVIEWPORT_H
-#define QT3D_QUICK_QUICK3DVIEWPORT_H
-
-#include <Qt3DRenderer/quick3dframegraphitem.h>
-#include <Qt3DRenderer/viewport.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3D {
-
-namespace Quick {
-
-class Quick3DViewport : public Quick3DFrameGraphItem, public virtual Viewport
-{
-    Q_OBJECT
-    Q_INTERFACES(Qt3D::Viewport)
-    Q_PROPERTY(QRectF rect READ rect WRITE setRect NOTIFY rectChanged)
-public:
-    explicit Quick3DViewport(Node *parent = 0);
-
-Q_SIGNALS:
-    void rectChanged() Q_DECL_OVERRIDE;
-    void enabledChanged() Q_DECL_OVERRIDE;
-};
-
-} // Quick
-
-} // Qt3D
-
-QT_END_NAMESPACE
-
-#endif // QUICK3DVIEWPORT_H
-
diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri
index 8c4658908..4c8d44515 100644
--- a/src/render/frontend/render-frontend.pri
+++ b/src/render/frontend/render-frontend.pri
@@ -25,13 +25,7 @@ HEADERS += \
     $$PWD/cameraselectoritem.h \
     $$PWD/renderpassfilteritem.h \
     $$PWD/techniquefilteritem.h \
-    $$PWD/rendertargetselectoritem.h \
-    $$PWD/quick3dtechniquefilter.h \
-    $$PWD/quick3dframegraphitem.h \
-    $$PWD/quick3dviewport.h \
-    $$PWD/quick3dcameraselector.h \
-    $$PWD/quick3drenderpassfilter.h \
-    $$PWD/quick3drendertargetselector.h
+    $$PWD/rendertargetselectoritem.h
 
 SOURCES += \
     $$PWD/effect.cpp \
@@ -51,10 +45,4 @@ SOURCES += \
     $$PWD/cameraselectoritem.cpp \
     $$PWD/techniquefilteritem.cpp \
     $$PWD/renderpassfilteritem.cpp \
-    $$PWD/rendertargetselectoritem.cpp \
-    $$PWD/quick3dtechniquefilter.cpp \
-    $$PWD/quick3dframegraphitem.cpp \
-    $$PWD/quick3dviewport.cpp \
-    $$PWD/quick3dcameraselector.cpp \
-    $$PWD/quick3drenderpassfilter.cpp \
-    $$PWD/quick3drendertargetselector.cpp
+    $$PWD/rendertargetselectoritem.cpp
diff --git a/src/render/render.pro b/src/render/render.pro
index ff1d30266..65e239696 100644
--- a/src/render/render.pro
+++ b/src/render/render.pro
@@ -1,6 +1,6 @@
 TARGET   = Qt3DRenderer
 
-QT      += core-private gui-private qml qml-private quick 3dcore
+QT      += core-private gui-private qml 3dcore
 
 DEFINES += QT3DRENDERER_LIBRARY