Remove legacy build system logic.

In Qt4, qtquick3d had to reinvent a lot of Qt's own build system logic.
In Qt5, modularization makes this unnecessary, so remove it.

Change-Id: I683acba659c1a3842e927262cacd9377cdac7c35
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>

14 files changed, 33 insertions, 26 deletions

diff --git a/tutorials/qt3d/cube1/cube1.pro b/tutorials/qt3d/cube1/cube1.pro
index f00497109..0d0e5a24b 100644
--- a/tutorials/qt3d/cube1/cube1.pro
+++ b/tutorials/qt3d/cube1/cube1.pro
@@ -1,6 +1,7 @@
 TEMPLATE = app
 TARGET = cube1
-CONFIG += qt warn_on qt3d
+CONFIG += qt warn_on
+QT += qt3d
 SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
-DESTDIR = ../../../bin/qt3d/tutorials
+DESTDIR = $$QT.qt3d.bins/qt3d/tutorials
diff --git a/tutorials/qt3d/cube1/main.cpp b/tutorials/qt3d/cube1/main.cpp
index 28fc9bb15..018eb1052 100644
--- a/tutorials/qt3d/cube1/main.cpp
+++ b/tutorials/qt3d/cube1/main.cpp
@@ -38,12 +38,12 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
+#include <QGuiApplication>
 #include "cubeview.h"
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
     CubeView view;
     view.show();
     return app.exec();
diff --git a/tutorials/qt3d/cube2/cube2.pro b/tutorials/qt3d/cube2/cube2.pro
index bdf386ddd..79cd39cab 100644
--- a/tutorials/qt3d/cube2/cube2.pro
+++ b/tutorials/qt3d/cube2/cube2.pro
@@ -1,6 +1,7 @@
 TEMPLATE = app
 TARGET = cube2
-CONFIG += qt warn_on qt3d
+CONFIG += qt warn_on
+QT += qt3d
 SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
-DESTDIR = ../../../bin/qt3d/tutorials
+DESTDIR = $$QT.qt3d.bins/qt3d/tutorials
diff --git a/tutorials/qt3d/cube2/main.cpp b/tutorials/qt3d/cube2/main.cpp
index 28fc9bb15..018eb1052 100644
--- a/tutorials/qt3d/cube2/main.cpp
+++ b/tutorials/qt3d/cube2/main.cpp
@@ -38,12 +38,12 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
+#include <QGuiApplication>
 #include "cubeview.h"
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
     CubeView view;
     view.show();
     return app.exec();
diff --git a/tutorials/qt3d/cube3/cube3.pro b/tutorials/qt3d/cube3/cube3.pro
index 8479e385d..16d2deeb4 100644
--- a/tutorials/qt3d/cube3/cube3.pro
+++ b/tutorials/qt3d/cube3/cube3.pro
@@ -1,6 +1,7 @@
 TEMPLATE = app
 TARGET = cube3
-CONFIG += qt warn_on qt3d
+CONFIG += qt warn_on
+QT += qt3d
 SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
-DESTDIR = ../../../bin/qt3d/tutorials
+DESTDIR = $$QT.qt3d.bins/qt3d/tutorials
diff --git a/tutorials/qt3d/cube3/main.cpp b/tutorials/qt3d/cube3/main.cpp
index 28fc9bb15..018eb1052 100644
--- a/tutorials/qt3d/cube3/main.cpp
+++ b/tutorials/qt3d/cube3/main.cpp
@@ -38,12 +38,12 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
+#include <QGuiApplication>
 #include "cubeview.h"
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
     CubeView view;
     view.show();
     return app.exec();
diff --git a/tutorials/qt3d/cube4/cube4.pro b/tutorials/qt3d/cube4/cube4.pro
index c36712be0..775dc5e00 100644
--- a/tutorials/qt3d/cube4/cube4.pro
+++ b/tutorials/qt3d/cube4/cube4.pro
@@ -1,7 +1,8 @@
 TEMPLATE = app
 TARGET = cube4
-CONFIG += qt warn_on qt3d
+CONFIG += qt warn_on
+QT += qt3d
 SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
 RESOURCES = cube.qrc
-DESTDIR = ../../../bin/qt3d/tutorials
+DESTDIR = $$QT.qt3d.bins/qt3d/tutorials
diff --git a/tutorials/qt3d/cube4/main.cpp b/tutorials/qt3d/cube4/main.cpp
index 28fc9bb15..018eb1052 100644
--- a/tutorials/qt3d/cube4/main.cpp
+++ b/tutorials/qt3d/cube4/main.cpp
@@ -38,12 +38,12 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
+#include <QGuiApplication>
 #include "cubeview.h"
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
     CubeView view;
     view.show();
     return app.exec();
diff --git a/tutorials/qt3d/penguin/main.cpp b/tutorials/qt3d/penguin/main.cpp
index e5c995db3..f371e1c67 100644
--- a/tutorials/qt3d/penguin/main.cpp
+++ b/tutorials/qt3d/penguin/main.cpp
@@ -38,13 +38,13 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
+#include <QGuiApplication>
 
 #include "modelview.h"
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
     ModelView view;
     view.show();
     return app.exec();
diff --git a/tutorials/qt3d/penguin/penguin.pro b/tutorials/qt3d/penguin/penguin.pro
index 22c96cf5b..3b45c07e0 100644
--- a/tutorials/qt3d/penguin/penguin.pro
+++ b/tutorials/qt3d/penguin/penguin.pro
@@ -1,8 +1,9 @@
 TEMPLATE = app
 TARGET = penguin
-CONFIG += qt warn_on qt3d
+CONFIG += qt warn_on
+QT += qt3d
 SOURCES = modelview.cpp \
     main.cpp
 HEADERS = modelview.h
 RESOURCES = model.qrc
-DESTDIR = ../../../bin/qt3d/tutorials
+DESTDIR = $$QT.qt3d.bins/qt3d/tutorials
diff --git a/tutorials/qt3d/penguin_advanced/main.cpp b/tutorials/qt3d/penguin_advanced/main.cpp
index e5c995db3..f371e1c67 100644
--- a/tutorials/qt3d/penguin_advanced/main.cpp
+++ b/tutorials/qt3d/penguin_advanced/main.cpp
@@ -38,13 +38,13 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
+#include <QGuiApplication>
 
 #include "modelview.h"
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
     ModelView view;
     view.show();
     return app.exec();
diff --git a/tutorials/qt3d/penguin_advanced/penguin_advanced.pro b/tutorials/qt3d/penguin_advanced/penguin_advanced.pro
index baf5b9a8f..8b60c6fdd 100644
--- a/tutorials/qt3d/penguin_advanced/penguin_advanced.pro
+++ b/tutorials/qt3d/penguin_advanced/penguin_advanced.pro
@@ -1,7 +1,8 @@
 TEMPLATE = app
 TARGET = penguin_advanced
-DESTDIR = ../../../bin/qt3d/tutorials
-CONFIG += qt warn_on qt3d
+DESTDIR = $$QT.qt3d.bins/qt3d/tutorials
+CONFIG += qt warn_on
+QT += qt3d
 SOURCES = modelview.cpp \
     main.cpp
 HEADERS = modelview.h
diff --git a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro
index 44c475ff1..b466ee325 100644
--- a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro
+++ b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro
@@ -1,7 +1,8 @@
 TEMPLATE = app
 TARGET = teapot_bounce_qml
 CONFIG += qt warn_on
-CONFIG += qt3dquick
+
+QT += quick3d
 
 SOURCES += main.cpp
 HEADERS += ../qmlres.h
diff --git a/tutorials/quick3d/teapot_qml/teapot_qml.pro b/tutorials/quick3d/teapot_qml/teapot_qml.pro
index 0ae0d9dad..33b5f0039 100644
--- a/tutorials/quick3d/teapot_qml/teapot_qml.pro
+++ b/tutorials/quick3d/teapot_qml/teapot_qml.pro
@@ -1,8 +1,8 @@
 TEMPLATE = app
 TARGET = teapot_qml
 CONFIG += qt warn_on
-CONFIG += qt3dquick
 
+QT += quick3d
 
 SOURCES += main.cpp
 HEADERS += ../qmlres.h