7 files changed, 129 insertions, 25 deletions
diff --git a/tutorials/quick3d/teapot_qml/main.cpp b/tutorials/quick3d/teapot_qml/main.cpp
index b3cc4a590..9a878d71c 100644
--- a/tutorials/quick3d/teapot_qml/main.cpp
+++ b/tutorials/quick3d/teapot_qml/main.cpp
@@ -39,30 +39,9 @@
 **
 ****************************************************************************/
 
-#include <QGuiApplication>
-#include <QQuickView>
-
-#include "../qmlres.h"
+#include <qmlres.h>
 
 int main(int argc, char *argv[])
 {
-    QGuiApplication app(argc, argv);
-
-    QSurfaceFormat f;
-    f.setSamples(16);
-
-    QQuickView view;
-    view.setFormat(f);
-
-    QString qml = q_get_qmldir(QLatin1String("qml/teapot.qml"));
-    view.setSource(QUrl::fromLocalFile(qml));
-
-    if (QGuiApplication::arguments().contains(QLatin1String("-maximize")))
-        view.showMaximized();
-    else if (QGuiApplication::arguments().contains(QLatin1String("-fullscreen")))
-        view.showFullScreen();
-    else
-        view.show();
-
-    return app.exec();
+    return q_quick3d_main("qml/desktop.qml", "tutorials", argc, argv);
 }
diff --git a/tutorials/quick3d/teapot_qml/mt.qml b/tutorials/quick3d/teapot_qml/mt.qml
new file mode 100644
index 000000000..5a9396400
--- /dev/null
+++ b/tutorials/quick3d/teapot_qml/mt.qml
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtQuick3D examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import Qt3D 1.0
+import Qt3D.Shapes 1.0
+import "qml"
+
+Item {
+    width: 320
+    height: 480
+
+    Teapot {
+    }
+}
diff --git a/tutorials/quick3d/teapot_qml/qml/teapot.qml b/tutorials/quick3d/teapot_qml/qml/Teapot.qml
index 8e68e5219..8e68e5219 100644
--- a/tutorials/quick3d/teapot_qml/qml/teapot.qml
+++ b/tutorials/quick3d/teapot_qml/qml/Teapot.qml
diff --git a/tutorials/quick3d/teapot_qml/qml/desktop.qml b/tutorials/quick3d/teapot_qml/qml/desktop.qml
new file mode 100644
index 000000000..bcc6970b8
--- /dev/null
+++ b/tutorials/quick3d/teapot_qml/qml/desktop.qml
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the Qt3D examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import Qt3D 1.0
+import Qt3D.Shapes 1.0
+import "."
+
+Item {
+    width: 640
+    height: 480
+
+    Teapot {
+    }
+}
diff --git a/tutorials/quick3d/teapot_qml/qml/teapot.bez b/tutorials/quick3d/teapot_qml/qml/meshes/teapot.bez
index 02b2ac447..02b2ac447 100644
--- a/tutorials/quick3d/teapot_qml/qml/teapot.bez
+++ b/tutorials/quick3d/teapot_qml/qml/meshes/teapot.bez
diff --git a/tutorials/quick3d/teapot_qml/qtquick3d.ico b/tutorials/quick3d/teapot_qml/qtquick3d.ico
new file mode 100644
index 000000000..b3b85e37b
--- /dev/null
+++ b/tutorials/quick3d/teapot_qml/qtquick3d.ico
diff --git a/tutorials/quick3d/teapot_qml/teapot_qml.pro b/tutorials/quick3d/teapot_qml/teapot_qml.pro
index 018dd6d7f..a316488fb 100644
--- a/tutorials/quick3d/teapot_qml/teapot_qml.pro
+++ b/tutorials/quick3d/teapot_qml/teapot_qml.pro
@@ -2,7 +2,28 @@ TEMPLATE = app
 TARGET = teapot_qml
 CONFIG += qt warn_on
 
-QT += 3d quick
+QT += 3dquick quick
 
 SOURCES += main.cpp
-HEADERS += ../qmlres.h
+
+ICON_FILE = ../icon.png
+
+QML_FILES = \
+    qml/desktop.qml \
+    qml/Teapot.qml
+
+QML_INFRA_FILES = \
+    $$QML_FILES
+
+QML_MESHES_FILES = \
+    qml/meshes/teapot.bez
+
+CATEGORY = tutorials
+include(../../../pkg.pri)
+
+OTHER_FILES += \
+    mt.qml \
+    teapot_qml.rc \
+    $$QML_INFRA_FILES
+
+RC_FILE = teapot_qml.rc