summaryrefslogtreecommitdiffstats
path: root/examples/qt3d
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-05-13 10:54:48 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-05-13 18:07:34 +0000
commitd2995cbb25d5ba672c614c47ee1f7581a8c91f13 (patch)
treed2cdb19d39357edead52e3b56006f60ac65582f3 /examples/qt3d
parent50b3b06c2e232e6a19ad6ac948fc874b239750a1 (diff)
Remove exampleresources library from examples that do not use it.
Enable the examples to run stand-alone (when launched from Qt Creator's welcome screen). Task-number: QTBUG-45990 Change-Id: Idc53d8342e75faf962410a91c3b2fe26a02610e5 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d')
-rw-r--r--examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.pro2
-rw-r--r--examples/qt3d/deferred-renderer-qml/main.cpp4
-rw-r--r--examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro2
-rw-r--r--examples/qt3d/tessellation-modes/main.cpp4
-rw-r--r--examples/qt3d/tessellation-modes/tessellation-modes.pro2
5 files changed, 0 insertions, 14 deletions
diff --git a/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.pro b/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.pro
index 2b1329c2e..1643f2242 100644
--- a/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.pro
+++ b/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.pro
@@ -2,8 +2,6 @@ TEMPLATE = app
QT += 3dcore 3drenderer 3dinput 3dquick qml quick
-include("../exampleresources/exampleresources.pri")
-
HEADERS += \
diff --git a/examples/qt3d/deferred-renderer-qml/main.cpp b/examples/qt3d/deferred-renderer-qml/main.cpp
index 0ad35ff6c..533bea16b 100644
--- a/examples/qt3d/deferred-renderer-qml/main.cpp
+++ b/examples/qt3d/deferred-renderer-qml/main.cpp
@@ -40,8 +40,6 @@
#include <Qt3DInput/QInputAspect>
#include <Qt3DQuick/QQmlAspectEngine>
-#include <exampleresources.h>
-
#include <QGuiApplication>
#include <QtQml>
@@ -49,8 +47,6 @@ int main(int argc, char* argv[])
{
QGuiApplication app(argc, argv);
- initializeAssetResources("../exampleresources/example-assets.qrb");
-
Qt3D::Window view;
Qt3D::Quick::QQmlAspectEngine engine;
diff --git a/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro b/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro
index 715460121..9d2a2636c 100644
--- a/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro
+++ b/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro
@@ -2,8 +2,6 @@ TEMPLATE = app
QT += 3dcore 3drenderer 3dinput
-include("../exampleresources/exampleresources.pri")
-
SOURCES += \
main.cpp \
examplescene.cpp \
diff --git a/examples/qt3d/tessellation-modes/main.cpp b/examples/qt3d/tessellation-modes/main.cpp
index ed9ae1e44..df1ba87de 100644
--- a/examples/qt3d/tessellation-modes/main.cpp
+++ b/examples/qt3d/tessellation-modes/main.cpp
@@ -41,8 +41,6 @@
#include <Qt3DInput/QInputAspect>
#include <Qt3DQuick/QQmlAspectEngine>
-#include <exampleresources.h>
-
#include <QGuiApplication>
#include <QtQml>
@@ -50,8 +48,6 @@ int main(int argc, char* argv[])
{
QGuiApplication app(argc, argv);
- initializeAssetResources("../exampleresources/example-assets.qrb");
-
Qt3D::Window view;
Qt3D::Quick::QQmlAspectEngine engine;
diff --git a/examples/qt3d/tessellation-modes/tessellation-modes.pro b/examples/qt3d/tessellation-modes/tessellation-modes.pro
index 683dd7f9f..96bf37b49 100644
--- a/examples/qt3d/tessellation-modes/tessellation-modes.pro
+++ b/examples/qt3d/tessellation-modes/tessellation-modes.pro
@@ -2,8 +2,6 @@ TEMPLATE = app
QT += 3dcore 3drenderer 3dinput 3dquick qml quick
-include("../exampleresources/exampleresources.pri")
-
HEADERS += \
tessellatedquadmesh.h