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>

91 files changed, 213 insertions, 443 deletions

diff --git a/demos/qt3d/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro
index 64501aa2f..6a257091c 100644
--- a/demos/qt3d/cubehouse/cubehouse.pro
+++ b/demos/qt3d/cubehouse/cubehouse.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = cubehouse
 CONFIG += qt warn_on
-!package: CONFIG += qt3d
+QT += qt3d
 
 CONFIG += qt3d_deploy_pkg
 include(../../../pkg.pri)
diff --git a/demos/qt3d/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro
index 1a39adc93..de95caaa6 100644
--- a/demos/qt3d/pageflip/pageflip.pro
+++ b/demos/qt3d/pageflip/pageflip.pro
@@ -1,8 +1,7 @@
 TEMPLATE = app
 TARGET = pageflip
 CONFIG += qt warn_on
-
-!package: CONFIG += qt3d
+QT += qt3d
 
 SOURCES = pageflip.cpp pageflipmath.cpp
 HEADERS = pageflipmath_p.h
diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro
index fc3083aa8..40427ed08 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3d.pro
+++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro
@@ -3,8 +3,7 @@ TARGET = photobrowser3d
 CONFIG += qt warn_on
 
 include(../../../pkg.pri)
-!package: CONFIG += qt3d
-package: QT += opengl
+QT += qt3d opengl
 
 SOURCES += main.cpp\
     photobrowser3dview.cpp \
diff --git a/demos/qt3d/shapes/shapes.pro b/demos/qt3d/shapes/shapes.pro
index ea06164a7..32a774fa8 100644
--- a/demos/qt3d/shapes/shapes.pro
+++ b/demos/qt3d/shapes/shapes.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = shapes
 CONFIG += qt warn_on
-!package: CONFIG += qt3d
+QT += qt3d
 
 SOURCES = shapes.cpp
 
diff --git a/demos/qt3d/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro
index 9debf19a7..0841e3179 100644
--- a/demos/qt3d/teaservice/teaservice.pro
+++ b/demos/qt3d/teaservice/teaservice.pro
@@ -3,7 +3,7 @@ TARGET = teaservice
 CONFIG += qt warn_on
 
 include(../../../pkg.pri)
-!package: CONFIG += qt3d
+QT += qt3d
 
 SOURCES = teaservice.cpp meshobject.cpp sceneobject.cpp perpixeleffect.cpp
 HEADERS = meshobject.h sceneobject.h perpixeleffect.h
diff --git a/examples/qt3d/basket/basket.pro b/examples/qt3d/basket/basket.pro
index 384572b99..03d6370b7 100644
--- a/examples/qt3d/basket/basket.pro
+++ b/examples/qt3d/basket/basket.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = basket
 CONFIG += qt warn_on
-!package: CONFIG += qt3d
+QT += qt3d
 
 CONFIG += qt3d_deploy_pkg
 include(../../../pkg.pri)
diff --git a/examples/qt3d/builder/builder.pro b/examples/qt3d/builder/builder.pro
index eeb25762f..5048fae4c 100644
--- a/examples/qt3d/builder/builder.pro
+++ b/examples/qt3d/builder/builder.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = builder
 CONFIG += qt warn_on
 
-!package: CONFIG += qt3d
+QT += qt3d
 
 SOURCES = builder.cpp \
     main.cpp
diff --git a/examples/qt3d/cube/cube.pro b/examples/qt3d/cube/cube.pro
index d180d7cb4..a853d4eee 100644
--- a/examples/qt3d/cube/cube.pro
+++ b/examples/qt3d/cube/cube.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = cube
 CONFIG += qt warn_on
-!package: CONFIG += qt3d
+QT += qt3d
 
 SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
diff --git a/examples/qt3d/cylinder/cylinder.pro b/examples/qt3d/cylinder/cylinder.pro
index 6c95819bd..0d29cf8ac 100644
--- a/examples/qt3d/cylinder/cylinder.pro
+++ b/examples/qt3d/cylinder/cylinder.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = cylinder
 CONFIG += qt warn_on
-!package: CONFIG += qt3d
+QT += qt3d
 
 SOURCES = cylinderview.cpp main.cpp
 HEADERS = cylinderview.h
diff --git a/examples/qt3d/geometry/geometry.pro b/examples/qt3d/geometry/geometry.pro
index 367ae5dfb..54da9d4ac 100644
--- a/examples/qt3d/geometry/geometry.pro
+++ b/examples/qt3d/geometry/geometry.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = geometry
 CONFIG += qt warn_on
-!package: CONFIG += qt3d
+QT += qt3d
 
 SOURCES = geometryview.cpp \
     main.cpp \
diff --git a/examples/qt3d/graphicsview/graphicsview.pro b/examples/qt3d/graphicsview/graphicsview.pro
index ea5fc7fcd..b6da55ea5 100644
--- a/examples/qt3d/graphicsview/graphicsview.pro
+++ b/examples/qt3d/graphicsview/graphicsview.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = graphicsview
 CONFIG += qt warn_on
-!package: CONFIG += qt3d
+QT += qt3d
 
 VPATH += $$PWD/../../src/threed/geometry
 SOURCES = \
diff --git a/examples/qt3d/nesting/nesting.pro b/examples/qt3d/nesting/nesting.pro
index 16d43baf6..727503153 100644
--- a/examples/qt3d/nesting/nesting.pro
+++ b/examples/qt3d/nesting/nesting.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = nesting
 CONFIG += qt warn_on
-!package: CONFIG += qt3d
+QT += qt3d
 
 SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
diff --git a/examples/qt3d/solarsystem/solarsystem.pro b/examples/qt3d/solarsystem/solarsystem.pro
index f1f6dea03..a55e5e33e 100644
--- a/examples/qt3d/solarsystem/solarsystem.pro
+++ b/examples/qt3d/solarsystem/solarsystem.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = solarsystem
 CONFIG += qt warn_on
-!package: CONFIG += qt3d
+QT += qt3d
 
 SOURCES = solarsystem.cpp \
     main.cpp
diff --git a/examples/qt3d/tank/tank.pro b/examples/qt3d/tank/tank.pro
index a734e4cdc..9092ab586 100644
--- a/examples/qt3d/tank/tank.pro
+++ b/examples/qt3d/tank/tank.pro
@@ -1,7 +1,7 @@
 TARGET = tank
 TEMPLATE = app
 CONFIG += qt warn_on
-!package: CONFIG += qt3d
+QT += qt3d
 
 SOURCES += main.cpp\
     tankview.cpp \
diff --git a/examples/qt3d/teapot/teapot.pro b/examples/qt3d/teapot/teapot.pro
index 22b79a32f..16ab7b4e1 100644
--- a/examples/qt3d/teapot/teapot.pro
+++ b/examples/qt3d/teapot/teapot.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = teapot
 CONFIG += qt warn_on
-!package: CONFIG += qt3d
+QT += qt3d
 
 SOURCES = teapotview.cpp main.cpp
 HEADERS = teapotview.h
diff --git a/pkg.pri b/pkg.pri
index 540da7e0e..78e39f6e6 100644
--- a/pkg.pri
+++ b/pkg.pri
@@ -117,7 +117,7 @@ qt3d_deploy_qml {
             TARGET_DIR = /opt/mt/applications/$$TARGET
         }
     } else {
-        TARGET_DIR = $$QT3D_INSTALL_DATA/quick3d/resources/examples/$$TARGET
+        TARGET_DIR = $$[QT_INSTALL_DATA]/quick3d/resources/examples/$$TARGET
     }
     symbian {
         TARGET_DIR = .
@@ -253,12 +253,12 @@ defineTest(qtcAddDeployment) {
                 itemfiles = $${item}.files
                 $$itemfiles = $$eval($${deploymentfolder}.source)
                 itempath = $${item}.path
-                $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
+                $$itempath = $$[QT_INSTALL_PREFIX]/$$eval($${deploymentfolder}.target)
                 export($$itemfiles)
                 export($$itempath)
                 INSTALLS += $$item
             }
-            target.path = $${installPrefix}/bin
+            target.path = $$[QT_INSTALL_BINS]
         }
         export(icon.files)
         export(icon.path)
diff --git a/src/imports/shapes/shapes.pro b/src/imports/shapes/shapes.pro
index ae5556df5..e14e73687 100644
--- a/src/imports/shapes/shapes.pro
+++ b/src/imports/shapes/shapes.pro
@@ -2,24 +2,11 @@ TEMPLATE = lib
 TARGET  = qshapesqmlplugin
 CONFIG += qt plugin
 
-CONFIG += qt3dquick_deploy_pkg
-include(../../../pkg.pri)
+QT += qt3d quick3d
 
-# See the README in the root dir re this code
-package {
-    target.path += $$QT3D_INSTALL_IMPORTS/Qt3D/Shapes
-    INSTALLS += target
-    QT += declarative
-} else {
-    CONFIG += qt3dquick qt3d
-    DESTDIR = $$QT3D_INSTALL_IMPORTS/Qt3D/Shapes
-}
-
-win32 {
-    CONFIG(debug, debug|release) {
-        TARGET = $$member(TARGET, 0)d
-    }
-}
+DESTDIR = $$QT.quick3d.imports/Qt3D
+target.path = $$[QT_INSTALL_IMPORTS]/Qt3D
+INSTALLS += target
 
 SOURCES += \
     sphere.cpp \
@@ -47,17 +34,8 @@ qdeclarativesources.files += \
     teapot.bez
 # see the file README.library_xml for more on library.xml
 
-!package {
-    qdeclarative_in_place.input = qdeclarativesources.files
-    qdeclarative_in_place.output = $$QT3D_INSTALL_IMPORTS/Qt3D/Shapes/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
-    qdeclarative_in_place.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-    qdeclarative_in_place.CONFIG += no_link_no_clean
-    qdeclarative_in_place.variable_out = PRE_TARGETDEPS
-    QMAKE_EXTRA_COMPILERS += qdeclarative_in_place
-} else {
-    qdeclarativesources.path += $$QT3D_INSTALL_IMPORTS/Qt3D/Shapes
-    INSTALLS += qdeclarativesources
-}
+qdeclarativesources.path += $$[QT_INSTALL_IMPORTS]/Qt3D
+INSTALLS += qdeclarativesources
 
 OTHER_FILES += \
     README.plugins_types \
diff --git a/src/imports/threed/threed.pro b/src/imports/threed/threed.pro
index 28c106eda..acd5a45ed 100644
--- a/src/imports/threed/threed.pro
+++ b/src/imports/threed/threed.pro
@@ -2,23 +2,11 @@ TEMPLATE = lib
 TARGET  = qthreedqmlplugin
 CONFIG += qt plugin
 
-CONFIG += qt3dquick_deploy_pkg
-include(../../../pkg.pri)
+QT += qt3d quick3d
 
-# See the README in the root dir re this code
-package {
-    target.path += $$QT3D_INSTALL_IMPORTS/Qt3D
-    INSTALLS += target
-} else {
-    CONFIG += qt3dquick qt3d
-    DESTDIR = $$QT3D_INSTALL_IMPORTS/Qt3D
-}
-
-win32 {
-    CONFIG(debug, debug|release) {
-        TARGET = $$member(TARGET, 0)d
-    }
-}
+DESTDIR = $$QT.quick3d.imports/Qt3D
+target.path = $$[QT_INSTALL_IMPORTS]/Qt3D
+INSTALLS += target
 
 SOURCES += \
     threed.cpp \
@@ -46,17 +34,10 @@ qdeclarativesources.files += \
     library.xml \
     plugins.qmltypes
 
-!package {
-    qdeclarative_in_place.input = qdeclarativesources.files
-    qdeclarative_in_place.output = $$QT3D_INSTALL_IMPORTS/Qt3D/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
-    qdeclarative_in_place.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-    qdeclarative_in_place.CONFIG += no_link_no_clean
-    qdeclarative_in_place.variable_out = PRE_TARGETDEPS
-    QMAKE_EXTRA_COMPILERS += qdeclarative_in_place
-} else {
-    qdeclarativesources.path += $$QT3D_INSTALL_IMPORTS/Qt3D
-    INSTALLS += qdeclarativesources
-}
+qdeclarativesources.path += $$[QT_INSTALL_IMPORTS]/Qt3D
+INSTALLS += qdeclarativesources
+
+
 
 OTHER_FILES += \
     README.plugins_types \
diff --git a/src/plugins/imageformats/tga/tga.pro b/src/plugins/imageformats/tga/tga.pro
index 3b4d66cba..d3dfc0bf0 100644
--- a/src/plugins/imageformats/tga/tga.pro
+++ b/src/plugins/imageformats/tga/tga.pro
@@ -1,11 +1,11 @@
 TARGET = qtga
 include(../../qpluginbase.pri)
-include(../../../../pkg.pri)
-!package: DESTDIR = $$QT3D_INSTALL_PLUGINS/imageformats
 HEADERS += qtgahandler.h \
     qtgafile.h
 SOURCES += main.cpp \
     qtgahandler.cpp \
     qtgafile.cpp
-target.path += $$QT3D_INSTALL_PLUGINS/imageformats
+
+DESTDIR = $$QT.qt3d.plugins/imageformats
+target.path = $$[QT_INSTALL_PLUGINS]/imageformats
 INSTALLS += target
diff --git a/src/plugins/sceneformats/3ds/3ds.pro b/src/plugins/sceneformats/3ds/3ds.pro
index 0dabe5fc0..78d4c44d6 100644
--- a/src/plugins/sceneformats/3ds/3ds.pro
+++ b/src/plugins/sceneformats/3ds/3ds.pro
@@ -1,6 +1,5 @@
 TARGET = qscene3ds
 include(../../qpluginbase.pri)
-include(../../../../pkg.pri)
 HEADERS += qgl3dsloader.h \
     qgl3dsscene.h \
     qgl3dsscenehandler.h \
@@ -11,30 +10,11 @@ SOURCES += main.cpp \
     qgl3dsscenehandler.cpp \
     qgl3dsmesh.cpp
 
-# See the README in the root dir re this code
-package {
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../threed
-        INCLUDEPATH += ../../../threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../threed -lQt3D
-        }
-        INCLUDEPATH += ../../../../include/Qt3D
-    }
-    target.path = $$QT3D_INSTALL_PLUGINS/sceneformats]
-    INSTALLS += target
-} else {
-    CONFIG += qt3d
-    DESTDIR = $$QT3D_INSTALL_PLUGINS/sceneformats
-}
+QT += qt3d
+
+DESTDIR = $$QT.qt3d.plugins/sceneformats
+target.path = $$[QT_INSTALL_PLUGINS]/sceneformats
+INSTALLS += target
 
 system_3ds {
     !isEmpty(QMAKE_INCDIR_3DS):INCLUDEPATH += $$QMAKE_INCDIR_3DS
diff --git a/src/plugins/sceneformats/assimp/assimp.pro b/src/plugins/sceneformats/assimp/assimp.pro
index 9be99fd0f..2f6dcc13f 100644
--- a/src/plugins/sceneformats/assimp/assimp.pro
+++ b/src/plugins/sceneformats/assimp/assimp.pro
@@ -1,6 +1,5 @@
 TARGET = qsceneai
 include(../../qpluginbase.pri)
-include(../../../../pkg.pri)
 HEADERS += qailoader.h \
     qaiscene.h \
     qaiscenehandler.h \
@@ -15,30 +14,11 @@ SOURCES += main.cpp \
     ailoaderiostream.cpp \
     ailoaderiosystem.cpp
 
-# See the README in the root dir re this code
-package {
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../threed
-        INCLUDEPATH += ../../../threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../threed -lQt3D
-        }
-        INCLUDEPATH += ../../../../include/Qt3D
-    }
-    target.path = $$QT3D_INSTALL_PLUGINS/sceneformats
-    INSTALLS += target
-} else {
-    CONFIG += qt3d
-    DESTDIR = $$QT3D_INSTALL_PLUGINS/sceneformats
-}
+QT += qt3d
+
+DESTDIR = $$QT.qt3d.plugins/sceneformats
+target.path = $$[QT_INSTALL_PLUGINS]/sceneformats
+INSTALLS += target
 
 # suppress warnings about std::copy using unsafe parameters
 win32: DEFINES +=_SCL_SECURE_NO_WARNINGS
diff --git a/src/plugins/sceneformats/bezier/bezier.pro b/src/plugins/sceneformats/bezier/bezier.pro
index 8307a0554..50acdb3a5 100644
--- a/src/plugins/sceneformats/bezier/bezier.pro
+++ b/src/plugins/sceneformats/bezier/bezier.pro
@@ -1,6 +1,5 @@
 TARGET  = qscenebezier
 include(../../qpluginbase.pri)
-include(../../../../pkg.pri)
 
 HEADERS += qglbezierscene.h \
            qglbezierscenehandler.h
@@ -8,27 +7,8 @@ SOURCES += main.cpp \
            qglbezierscene.cpp \
            qglbezierscenehandler.cpp
 
-# See the README in the root dir re this code
-package {
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../threed
-        INCLUDEPATH += ../../../threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../threed -lQt3D
-        }
-        INCLUDEPATH += ../../../../include/Qt3D
-    }
-    target.path = $$QT3D_INSTALL_PLUGINS/sceneformats
-    INSTALLS += target
-} else {
-    CONFIG += qt3d
-    DESTDIR = $$QT3D_INSTALL_PLUGINS/sceneformats
-}
+QT += qt3d
+
+DESTDIR = $$QT.qt3d.plugins/sceneformats
+target.path = $$[QT_INSTALL_PLUGINS]/sceneformats
+INSTALLS += target
diff --git a/src/plugins/sceneformats/obj/obj.pro b/src/plugins/sceneformats/obj/obj.pro
index a14a1ce7a..2590f3d4d 100644
--- a/src/plugins/sceneformats/obj/obj.pro
+++ b/src/plugins/sceneformats/obj/obj.pro
@@ -1,6 +1,5 @@
 TARGET  = qsceneobj
 include(../../qpluginbase.pri)
-include(../../../../pkg.pri)
 
 HEADERS += qglobjscene.h \
            qglobjscenehandler.h
@@ -8,30 +7,8 @@ SOURCES += main.cpp \
            qglobjscene.cpp \
            qglobjscenehandler.cpp
 
-# See the README in the root dir re this code
-package {
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../threed
-        INCLUDEPATH += ../../../threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../threed -lQt3D
-        }
-        INCLUDEPATH += ../../../../include/Qt3D
-    }
-    target.path = $$QT3D_INSTALL_PLUGINS/sceneformats
-    INSTALLS += target
-} else {
-    CONFIG += qt3d
-    DESTDIR = $$QT3D_INSTALL_PLUGINS/sceneformats
-}
+QT += qt3d
 
-target.path += $$QT3D_INSTALL_PLUGINS/sceneformats
+DESTDIR = $$QT.qt3d.plugins/sceneformats
+target.path = $$[QT_INSTALL_PLUGINS]/sceneformats
 INSTALLS += target
diff --git a/src/quick3d/quick3d.pro b/src/quick3d/quick3d.pro
index 04761d26d..e84f5a4cd 100644
--- a/src/quick3d/quick3d.pro
+++ b/src/quick3d/quick3d.pro
@@ -1,5 +1,14 @@
-TEMPLATE = lib
-TARGET = Qt3DQuick$${QT_LIBINFIX}
+load(qt_module)
+
+TARGET     = Qt3DQuick
+MODULE     = quick3d
+QT         = core gui network declarative qt3d
+
+CONFIG += module
+MODULE_PRI = ../../modules/qt_qt3dquick.pri
+
+load(qt_module_config)
+
 gcov {
     CONFIG += staticlib warn_on
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
@@ -8,53 +17,6 @@ gcov {
     CONFIG += dll warn_on
 }
 
-QT += declarative
-
-include(../../pkg.pri)
-
-# See the README in the root dir re this code
-package {
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../threed
-        INCLUDEPATH += ../threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                LIBS += ..\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../threed -lQt3D
-        }
-        INCLUDEPATH += ../../include/Qt3D
-    }
-    win32 {
-        target.path = $$QT3D_INSTALL_BINS
-    } else {
-        target.path = $$QT3D_INSTALL_LIBS
-    }
-    INSTALLS += target
-    QT += opengl network
-} else {
-    CONFIG += qt3d
-    DESTDIR = $$QT3D_INSTALL_LIBS
-}
-
-win32 {
-    !static:DEFINES += QT_MAKEDLL
-    package {
-        installDll.path = $$QT3D_INSTALL_BINS
-        installDll.files = $$DESTDIR_TARGET
-        INSTALLS += installDll
-    } else {
-        DLLDESTDIR = $$QT3D_INSTALL_BINS
-    }
-    CONFIG(debug, debug|release) {
-        TARGET = $$member(TARGET, 0)d
-    }
-}
-
 include(quick3d.pri)
 
 PUBLIC_HEADERS = $$HEADERS
@@ -62,34 +24,3 @@ HEADERS += $$PRIVATE_HEADERS
 DEFINES += QT_BUILD_QT3D_QUICK_LIB
 
 !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
-
-package: !qtc_harmattan {
-    distInstalls.files = $$PUBLIC_HEADERS
-    distInstalls.path = $$[QT_INSTALL_HEADERS]/Qt3DQuick
-    INSTALLS += distInstalls
-}
-
-# If Qt has been configured to build frameworks, then the build witll put
-# the Qt3DQuick library into a framework bundle, so put the headers in the bundle
-# as well.  Other OS's, or mac without frameworks, install the headers into
-# the Qt build tree directly.
-macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-    QMAKE_LFLAGS_SONAME = -Wl,-install_name,$$DESTDIR/
-    CONFIG += lib_bundle
-    FRAMEWORK_HEADERS.version = Versions
-    FRAMEWORK_HEADERS.path = Headers
-    FRAMEWORK_HEADERS.files = $$PUBLIC_HEADERS
-    QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
-} else {
-    exportHeaders.input = PUBLIC_HEADERS
-    package {
-        exportHeaders.output = ../../include/Qt3DQuick/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
-    } else {
-        exportHeaders.output = $$[QT_INSTALL_HEADERS]/Qt3DQuick/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
-    }
-    exportHeaders.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-    exportHeaders.CONFIG += no_link_no_clean
-    exportHeaders.variable_out = PRE_TARGETDEPS
-    QMAKE_EXTRA_COMPILERS += exportHeaders
-}
-
diff --git a/src/threed/threed.pro b/src/threed/threed.pro
index 3166ca681..70430a2ec 100644
--- a/src/threed/threed.pro
+++ b/src/threed/threed.pro
@@ -1,5 +1,14 @@
-TEMPLATE = lib
-TARGET = Qt3D$${QT_LIBINFIX}
+load(qt_module)
+
+TARGET     = Qt3D
+MODULE     = qt3d
+QT         = core-private gui-private opengl network
+
+CONFIG += module
+MODULE_PRI = ../../modules/qt_qt3d.pri
+
+load(qt_module_config)
+
 gcov {
     CONFIG += staticlib warn_on
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
@@ -7,37 +16,6 @@ gcov {
 } else {
     CONFIG += dll warn_on
 }
-QT += opengl
-QT += network
-QT += gui-private
-QT += core-private
-
-include(../../pkg.pri)
-
-package {
-    win32 {
-        target.path = $$QT3D_INSTALL_BINS
-    } else {
-        target.path = $$QT3D_INSTALL_LIBS
-    }
-    INSTALLS += target
-} else {
-    DESTDIR = $$QT3D_INSTALL_LIBS
-}
-
-win32 {
-    !static:DEFINES += QT_MAKEDLL
-    package {
-        installDll.path = $$QT3D_INSTALL_BINS
-        installDll.files = $$DESTDIR_TARGET
-        INSTALLS += installDll
-    } else {
-        DLLDESTDIR = $$QT3D_INSTALL_BINS
-    }
-    CONFIG(debug, debug|release) {
-        TARGET = $$member(TARGET, 0)d
-    }
-}
 
 include(../private/private.pri)
 include(threed.pri)
@@ -46,33 +24,3 @@ HEADERS += $$PRIVATE_HEADERS
 DEFINES += QT_BUILD_QT3D_LIB
 
 !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
-
-package: !qtc_harmattan {
-    distInstalls.files = $$PUBLIC_HEADERS
-    distInstalls.path = $$[QT_INSTALL_HEADERS]/Qt3D
-    INSTALLS += distInstalls
-}
-
-# If Qt has been configured to build frameworks, then the build will put
-# the Qt3D library into a framework bundle, so put the headers in the bundle
-# as well.  Other OS's, or mac without frameworks, install the headers into
-# the Qt build tree directly.
-macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-    QMAKE_LFLAGS_SONAME = -Wl,-install_name,$$DESTDIR/
-    CONFIG += lib_bundle
-    FRAMEWORK_HEADERS.version = Versions
-    FRAMEWORK_HEADERS.path = Headers
-    FRAMEWORK_HEADERS.files = $$PUBLIC_HEADERS
-    QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
-} else {
-    exportHeaders.input = PUBLIC_HEADERS
-    package {
-        exportHeaders.output = ../../include/Qt3D/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
-    } else {
-        exportHeaders.output = $$[QT_INSTALL_HEADERS]/Qt3D/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
-    }
-    exportHeaders.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-    exportHeaders.CONFIG += no_link_no_clean
-    exportHeaders.variable_out = PRE_TARGETDEPS
-    QMAKE_EXTRA_COMPILERS += exportHeaders
-}
diff --git a/tests/auto/threed/load_model/load_model.pro b/tests/auto/threed/load_model/load_model.pro
index 68c8d9591..41f728a2c 100644
--- a/tests/auto/threed/load_model/load_model.pro
+++ b/tests/auto/threed/load_model/load_model.pro
@@ -1,8 +1,8 @@
 TARGET = tst_load_model
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_load_model.cpp
 
diff --git a/tests/auto/threed/qareaallocator/qareaallocator.pro b/tests/auto/threed/qareaallocator/qareaallocator.pro
index 04e13fc6c..9834ef780 100644
--- a/tests/auto/threed/qareaallocator/qareaallocator.pro
+++ b/tests/auto/threed/qareaallocator/qareaallocator.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qareaallocator
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qareaallocator.cpp
diff --git a/tests/auto/threed/qarray/qarray.pro b/tests/auto/threed/qarray/qarray.pro
index d288ae8ba..5c28c5a6a 100644
--- a/tests/auto/threed/qarray/qarray.pro
+++ b/tests/auto/threed/qarray/qarray.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qarray
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qarray.cpp
diff --git a/tests/auto/threed/qbox3d/qbox3d.pro b/tests/auto/threed/qbox3d/qbox3d.pro
index 9bfe75437..b488bd2a2 100644
--- a/tests/auto/threed/qbox3d/qbox3d.pro
+++ b/tests/auto/threed/qbox3d/qbox3d.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qbox3d
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qbox3d.cpp
diff --git a/tests/auto/threed/qcolor4ub/qcolor4ub.pro b/tests/auto/threed/qcolor4ub/qcolor4ub.pro
index 77f74a247..64c1166d1 100644
--- a/tests/auto/threed/qcolor4ub/qcolor4ub.pro
+++ b/tests/auto/threed/qcolor4ub/qcolor4ub.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qcolor4ub
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qcolor4ub.cpp
diff --git a/tests/auto/threed/qcustomdataarray/qcustomdataarray.pro b/tests/auto/threed/qcustomdataarray/qcustomdataarray.pro
index 5f4dfbd8f..e6cf6d241 100644
--- a/tests/auto/threed/qcustomdataarray/qcustomdataarray.pro
+++ b/tests/auto/threed/qcustomdataarray/qcustomdataarray.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qcustomdataarray
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qcustomdataarray.cpp
diff --git a/tests/auto/threed/qgeometrydata/qgeometrydata.pro b/tests/auto/threed/qgeometrydata/qgeometrydata.pro
index 453205483..f2a624ed0 100644
--- a/tests/auto/threed/qgeometrydata/qgeometrydata.pro
+++ b/tests/auto/threed/qgeometrydata/qgeometrydata.pro
@@ -1,8 +1,8 @@
 TARGET = tst_qgeometrydata
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 INCLUDEPATH += ../../../shared
 INCLUDEPATH += ../../../../src/threed/geometry
diff --git a/tests/auto/threed/qglabstractsurface/qglabstractsurface.pro b/tests/auto/threed/qglabstractsurface/qglabstractsurface.pro
index 429d72168..887e9b763 100644
--- a/tests/auto/threed/qglabstractsurface/qglabstractsurface.pro
+++ b/tests/auto/threed/qglabstractsurface/qglabstractsurface.pro
@@ -1,8 +1,8 @@
 TARGET = tst_qglabstractsurface
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qglabstractsurface.cpp
 QT += widgets
diff --git a/tests/auto/threed/qglattributedescription/qglattributedescription.pro b/tests/auto/threed/qglattributedescription/qglattributedescription.pro
index 9573b0dad..17071c6f8 100644
--- a/tests/auto/threed/qglattributedescription/qglattributedescription.pro
+++ b/tests/auto/threed/qglattributedescription/qglattributedescription.pro
@@ -1,8 +1,8 @@
 TARGET = tst_qglattributedescription
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 INCLUDEPATH += ../../../../threed/viewing
 VPATH += ../../../../threed/viewing
diff --git a/tests/auto/threed/qglattributeset/qglattributeset.pro b/tests/auto/threed/qglattributeset/qglattributeset.pro
index 25c97c2a7..fc80c846a 100644
--- a/tests/auto/threed/qglattributeset/qglattributeset.pro
+++ b/tests/auto/threed/qglattributeset/qglattributeset.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglattributeset
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qglattributeset.cpp
diff --git a/tests/auto/threed/qglattributevalue/qglattributevalue.pro b/tests/auto/threed/qglattributevalue/qglattributevalue.pro
index 98ab9c1e3..055457e7d 100644
--- a/tests/auto/threed/qglattributevalue/qglattributevalue.pro
+++ b/tests/auto/threed/qglattributevalue/qglattributevalue.pro
@@ -1,8 +1,8 @@
 TARGET = tst_qglattributevalue
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 INCLUDEPATH += ../../../../threed/viewing
 VPATH += ../../../../threed/viewing
diff --git a/tests/auto/threed/qglbezierpatches/qglbezierpatches.pro b/tests/auto/threed/qglbezierpatches/qglbezierpatches.pro
index 9ab653fc0..282259f59 100644
--- a/tests/auto/threed/qglbezierpatches/qglbezierpatches.pro
+++ b/tests/auto/threed/qglbezierpatches/qglbezierpatches.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglbezierpatches
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qglbezierpatches.cpp
diff --git a/tests/auto/threed/qglbuilder/qglbuilder.pro b/tests/auto/threed/qglbuilder/qglbuilder.pro
index 3f4dc08c0..07a078982 100644
--- a/tests/auto/threed/qglbuilder/qglbuilder.pro
+++ b/tests/auto/threed/qglbuilder/qglbuilder.pro
@@ -1,8 +1,8 @@
 TARGET = tst_qglbuilder
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 INCLUDEPATH += ../../../shared
 SOURCES += tst_qglbuilder.cpp
diff --git a/tests/auto/threed/qglcamera/qglcamera.pro b/tests/auto/threed/qglcamera/qglcamera.pro
index d972a377f..89ccf5b0a 100644
--- a/tests/auto/threed/qglcamera/qglcamera.pro
+++ b/tests/auto/threed/qglcamera/qglcamera.pro
@@ -1,8 +1,8 @@
 TARGET = tst_qglcamera
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 INCLUDEPATH += ../../../../threed/viewing
 VPATH += ../../../../threed/viewing
diff --git a/tests/auto/threed/qglcameraanimation/qglcameraanimation.pro b/tests/auto/threed/qglcameraanimation/qglcameraanimation.pro
index b2899905e..9e21a9128 100644
--- a/tests/auto/threed/qglcameraanimation/qglcameraanimation.pro
+++ b/tests/auto/threed/qglcameraanimation/qglcameraanimation.pro
@@ -1,8 +1,8 @@
 TARGET = tst_qglcameraanimation
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 INCLUDEPATH += ../../../../threed/viewing
 VPATH += ../../../../threed/viewing
diff --git a/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro b/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro
index 2c8d4f9ef..1f7a7101d 100644
--- a/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro
+++ b/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro
@@ -1,10 +1,10 @@
 TARGET = tst_qglcolladafxeffectfactory
 CONFIG += testcase
 TEMPLATE = app
-QT += testlib
+QT += testlib qt3d
 QT += opengl
 
-CONFIG += warn_on qt3d
+CONFIG += warn_on
 
 INCLUDEPATH += ../../../../demos/shaderwizard/
 VPATH += ../../../../demos/shaderwizard/
diff --git a/tests/auto/threed/qglcube/qglcube.pro b/tests/auto/threed/qglcube/qglcube.pro
index 203ff4279..7adc2f249 100644
--- a/tests/auto/threed/qglcube/qglcube.pro
+++ b/tests/auto/threed/qglcube/qglcube.pro
@@ -1,8 +1,8 @@
 TARGET = tst_qglcube
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 INCLUDEPATH += ../../../shared
 SOURCES += tst_qglcube.cpp
diff --git a/tests/auto/threed/qglcylinder/qglcylinder.pro b/tests/auto/threed/qglcylinder/qglcylinder.pro
index c3d926667..fdfca9e04 100644
--- a/tests/auto/threed/qglcylinder/qglcylinder.pro
+++ b/tests/auto/threed/qglcylinder/qglcylinder.pro
@@ -1,8 +1,8 @@
 TARGET = tst_qglcylinder
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 INCLUDEPATH += ../../../shared
 SOURCES += tst_qglcylinder.cpp
diff --git a/tests/auto/threed/qglindexbuffer/qglindexbuffer.pro b/tests/auto/threed/qglindexbuffer/qglindexbuffer.pro
index 60d1fcbe9..25dbe2aaa 100644
--- a/tests/auto/threed/qglindexbuffer/qglindexbuffer.pro
+++ b/tests/auto/threed/qglindexbuffer/qglindexbuffer.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglindexbuffer
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qglindexbuffer.cpp
diff --git a/tests/auto/threed/qgllightmodel/qgllightmodel.pro b/tests/auto/threed/qgllightmodel/qgllightmodel.pro
index e1a2b4b9d..589f10595 100644
--- a/tests/auto/threed/qgllightmodel/qgllightmodel.pro
+++ b/tests/auto/threed/qgllightmodel/qgllightmodel.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qgllightmodel
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qgllightmodel.cpp
diff --git a/tests/auto/threed/qgllightparameters/qgllightparameters.pro b/tests/auto/threed/qgllightparameters/qgllightparameters.pro
index cf834e011..9c8fea5d9 100644
--- a/tests/auto/threed/qgllightparameters/qgllightparameters.pro
+++ b/tests/auto/threed/qgllightparameters/qgllightparameters.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qgllightparameters
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qgllightparameters.cpp
diff --git a/tests/auto/threed/qglmaterial/qglmaterial.pro b/tests/auto/threed/qglmaterial/qglmaterial.pro
index 9d5a78ca2..02882f9a7 100644
--- a/tests/auto/threed/qglmaterial/qglmaterial.pro
+++ b/tests/auto/threed/qglmaterial/qglmaterial.pro
@@ -1,8 +1,8 @@
 TARGET = tst_qglmaterial
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qglmaterial.cpp
 QT += widgets
diff --git a/tests/auto/threed/qglmaterialcollection/qglmaterialcollection.pro b/tests/auto/threed/qglmaterialcollection/qglmaterialcollection.pro
index 652c115ce..98843570a 100644
--- a/tests/auto/threed/qglmaterialcollection/qglmaterialcollection.pro
+++ b/tests/auto/threed/qglmaterialcollection/qglmaterialcollection.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglmaterialcollection
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qglmaterialcollection.cpp
diff --git a/tests/auto/threed/qglpainter/qglpainter.pro b/tests/auto/threed/qglpainter/qglpainter.pro
index ce690e3e9..81d19f68b 100644
--- a/tests/auto/threed/qglpainter/qglpainter.pro
+++ b/tests/auto/threed/qglpainter/qglpainter.pro
@@ -1,8 +1,8 @@
 TARGET = tst_qglpainter
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 INCLUDEPATH += ../../../shared
 VPATH += ../../../shared
diff --git a/tests/auto/threed/qglrender/qglrender.pro b/tests/auto/threed/qglrender/qglrender.pro
index 6d5eaa418..92da88405 100644
--- a/tests/auto/threed/qglrender/qglrender.pro
+++ b/tests/auto/threed/qglrender/qglrender.pro
@@ -1,8 +1,8 @@
 TARGET = tst_qglrender
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qglrender.cpp
 QT+=widgets
diff --git a/tests/auto/threed/qglscenenode/qglscenenode.pro b/tests/auto/threed/qglscenenode/qglscenenode.pro
index f3457a524..489302ff5 100644
--- a/tests/auto/threed/qglscenenode/qglscenenode.pro
+++ b/tests/auto/threed/qglscenenode/qglscenenode.pro
@@ -1,8 +1,8 @@
 TARGET = tst_qglscenenode
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 INCLUDEPATH += ../../../shared
 SOURCES += tst_qglscenenode.cpp
diff --git a/tests/auto/threed/qglsection/qglsection.pro b/tests/auto/threed/qglsection/qglsection.pro
index ede5e4454..7a64d983b 100644
--- a/tests/auto/threed/qglsection/qglsection.pro
+++ b/tests/auto/threed/qglsection/qglsection.pro
@@ -1,8 +1,8 @@
 TARGET = tst_qglsection
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 INCLUDEPATH += ../../../shared
 SOURCES += tst_qglsection.cpp
diff --git a/tests/auto/threed/qglsharedresource/qglsharedresource.pro b/tests/auto/threed/qglsharedresource/qglsharedresource.pro
index fd11b6e94..9032bd408 100644
--- a/tests/auto/threed/qglsharedresource/qglsharedresource.pro
+++ b/tests/auto/threed/qglsharedresource/qglsharedresource.pro
@@ -1,8 +1,8 @@
 TARGET = tst_qglsharedresource
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 INCLUDEPATH += ../../../../src/threed/textures
 VPATH += ../../../../src/threed/textures
diff --git a/tests/auto/threed/qglsphere/qglsphere.pro b/tests/auto/threed/qglsphere/qglsphere.pro
index 93484af7c..71942cb3c 100644
--- a/tests/auto/threed/qglsphere/qglsphere.pro
+++ b/tests/auto/threed/qglsphere/qglsphere.pro
@@ -1,8 +1,8 @@
 TARGET = tst_qglsphere
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 INCLUDEPATH += ../../../shared
 SOURCES += tst_qglsphere.cpp
diff --git a/tests/auto/threed/qglvertexbundle/qglvertexbundle.pro b/tests/auto/threed/qglvertexbundle/qglvertexbundle.pro
index 589545a06..c9492258c 100644
--- a/tests/auto/threed/qglvertexbundle/qglvertexbundle.pro
+++ b/tests/auto/threed/qglvertexbundle/qglvertexbundle.pro
@@ -1,8 +1,8 @@
 TARGET = tst_qglvertexbundle
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qglvertexbundle.cpp
 QT+=widgets
diff --git a/tests/auto/threed/qgraphicstransform3d/qgraphicstransform3d.pro b/tests/auto/threed/qgraphicstransform3d/qgraphicstransform3d.pro
index 552bbe02a..0d4293971 100644
--- a/tests/auto/threed/qgraphicstransform3d/qgraphicstransform3d.pro
+++ b/tests/auto/threed/qgraphicstransform3d/qgraphicstransform3d.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qgraphicstransform3d
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qgraphicstransform3d.cpp
diff --git a/tests/auto/threed/qopenglfunctions/qopenglfunctions.pro b/tests/auto/threed/qopenglfunctions/qopenglfunctions.pro
index 32da71c68..f250a35d8 100644
--- a/tests/auto/threed/qopenglfunctions/qopenglfunctions.pro
+++ b/tests/auto/threed/qopenglfunctions/qopenglfunctions.pro
@@ -1,10 +1,10 @@
 TARGET = tst_qopenglfunctions
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
+QT += testlib qt3d
 QT += opengl
 
-CONFIG += warn_on qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qopenglfunctions.cpp
 QT+=widgets
diff --git a/tests/auto/threed/qplane3d/qplane3d.pro b/tests/auto/threed/qplane3d/qplane3d.pro
index c8e71cace..c8dbfb1bd 100644
--- a/tests/auto/threed/qplane3d/qplane3d.pro
+++ b/tests/auto/threed/qplane3d/qplane3d.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qplane3d
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qplane3d.cpp
diff --git a/tests/auto/threed/qray3d/qray3d.pro b/tests/auto/threed/qray3d/qray3d.pro
index 4f66dce44..1dc89415e 100644
--- a/tests/auto/threed/qray3d/qray3d.pro
+++ b/tests/auto/threed/qray3d/qray3d.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qray3d
 CONFIG += testcase
 TEMPLATE = app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 SOURCES += tst_qray3d.cpp
diff --git a/tests/auto/threed/qsphere3d/qsphere3d.pro b/tests/auto/threed/qsphere3d/qsphere3d.pro
index 412b6d216..cc6feb0a4 100644
--- a/tests/auto/threed/qsphere3d/qsphere3d.pro
+++ b/tests/auto/threed/qsphere3d/qsphere3d.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qsphere3d
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
+QT += testlib qt3d
 QT += opengl
-CONFIG += warn_on qt3d
+CONFIG += warn_on
 SOURCES += tst_qsphere3d.cpp
diff --git a/tests/auto/threed/qtriangle3d/qtriangle3d.pro b/tests/auto/threed/qtriangle3d/qtriangle3d.pro
index 6f819566d..31bfc104b 100644
--- a/tests/auto/threed/qtriangle3d/qtriangle3d.pro
+++ b/tests/auto/threed/qtriangle3d/qtriangle3d.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qtriangle3d
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qtriangle3d.cpp
diff --git a/tests/auto/threed/qvectorarray/qvectorarray.pro b/tests/auto/threed/qvectorarray/qvectorarray.pro
index 2f24b6053..783fa88d8 100644
--- a/tests/auto/threed/qvectorarray/qvectorarray.pro
+++ b/tests/auto/threed/qvectorarray/qvectorarray.pro
@@ -1,10 +1,10 @@
 TARGET = tst_qvectorarray
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib
+QT += testlib qt3d
 QT += opengl
 
-CONFIG += warn_on qt3d
+CONFIG += warn_on
 
 INCLUDEPATH += ../../../shared
 SOURCES += tst_qvectorarray.cpp
diff --git a/tests/benchmarks/qarray/qarray.pro b/tests/benchmarks/qarray/qarray.pro
index 5d780c882..d83241b99 100644
--- a/tests/benchmarks/qarray/qarray.pro
+++ b/tests/benchmarks/qarray/qarray.pro
@@ -1,5 +1,5 @@
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qarray.cpp
diff --git a/tests/benchmarks/qglbuilder_perf/qglbuilder_perf.pro b/tests/benchmarks/qglbuilder_perf/qglbuilder_perf.pro
index 7de2f50c7..e3aa14855 100644
--- a/tests/benchmarks/qglbuilder_perf/qglbuilder_perf.pro
+++ b/tests/benchmarks/qglbuilder_perf/qglbuilder_perf.pro
@@ -1,6 +1,6 @@
 TEMPLATE=app
-QT += testlib
-CONFIG += warn_on qt3d
+QT += testlib qt3d
+CONFIG += warn_on
 
 SOURCES += tst_qglbuilder_perf.cpp
-INCLUDEPATH += ../../../src/threed/geometry
+INCLUDEPATH += $$QT.qt3d.sources/geometry
diff --git a/tests/manual/animations/animations.pro b/tests/manual/animations/animations.pro
index 6cda0e12a..1fd243f9a 100644
--- a/tests/manual/animations/animations.pro
+++ b/tests/manual/animations/animations.pro
@@ -1,7 +1,8 @@
 TEMPLATE = app
 TARGET = tst_animations
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
+
+QT += quick3d
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/displaymodel/displaymodel.pro b/tests/manual/displaymodel/displaymodel.pro
index ea5596f6b..49b36b2c8 100644
--- a/tests/manual/displaymodel/displaymodel.pro
+++ b/tests/manual/displaymodel/displaymodel.pro
@@ -1,7 +1,8 @@
 TEMPLATE = app
 TARGET = tst_displaymodel
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
+
+QT += quick3d
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/model3ds/model3ds.pro b/tests/manual/model3ds/model3ds.pro
index cc8f0dc47..add175723 100644
--- a/tests/manual/model3ds/model3ds.pro
+++ b/tests/manual/model3ds/model3ds.pro
@@ -1,7 +1,8 @@
 TEMPLATE = app
 TARGET = tst_model3ds
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
+
+QT += quick3d
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/navigation1/navigation1.pro b/tests/manual/navigation1/navigation1.pro
index 8cc414403..025937a8d 100644
--- a/tests/manual/navigation1/navigation1.pro
+++ b/tests/manual/navigation1/navigation1.pro
@@ -1,7 +1,8 @@
 TEMPLATE = app
 TARGET = tst_navigation1
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
+
+QT += quick3d
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/qrc/qrc.pro b/tests/manual/qrc/qrc.pro
index 22b16abd1..eb566e43b 100644
--- a/tests/manual/qrc/qrc.pro
+++ b/tests/manual/qrc/qrc.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = tst_qrc
 CONFIG += qt warn_on
 
-!package: CONFIG += qt3dquick
+QT += quick3d
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/rotation/rotation.pro b/tests/manual/rotation/rotation.pro
index 35fa91cd5..e154ee1d5 100644
--- a/tests/manual/rotation/rotation.pro
+++ b/tests/manual/rotation/rotation.pro
@@ -1,7 +1,8 @@
 TEMPLATE = app
 TARGET = tst_rotation
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
+
+QT += quick3d
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/scaling/scaling.pro b/tests/manual/scaling/scaling.pro
index f2d1cc49d..49688fe4f 100644
--- a/tests/manual/scaling/scaling.pro
+++ b/tests/manual/scaling/scaling.pro
@@ -1,7 +1,8 @@
 TEMPLATE = app
 TARGET = tst_scaling
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
+
+QT += quick3d
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/submesh/submesh.pro b/tests/manual/submesh/submesh.pro
index 6b1138cc0..c02890240 100644
--- a/tests/manual/submesh/submesh.pro
+++ b/tests/manual/submesh/submesh.pro
@@ -1,7 +1,8 @@
 TEMPLATE = app
 TARGET = tst_submesh
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
+
+QT += quick3d
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/transformations/transformations.pro b/tests/manual/transformations/transformations.pro
index a74b4546d..b68bdc15e 100644
--- a/tests/manual/transformations/transformations.pro
+++ b/tests/manual/transformations/transformations.pro
@@ -1,7 +1,8 @@
 TEMPLATE = app
 TARGET = tst_transformations
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
+
+QT += quick3d
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/translation/translation.pro b/tests/manual/translation/translation.pro
index e3cd35844..eb86409d1 100644
--- a/tests/manual/translation/translation.pro
+++ b/tests/manual/translation/translation.pro
@@ -1,7 +1,8 @@
 TEMPLATE = app
 TARGET = tst_translation
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
+
+QT += quick3d
 
 SOURCES += main.cpp
 
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
diff --git a/util/meshcvt/meshcvt.pro b/util/meshcvt/meshcvt.pro
index 53f336af5..6feb982a6 100644
--- a/util/meshcvt/meshcvt.pro
+++ b/util/meshcvt/meshcvt.pro
@@ -1,6 +1,6 @@
 TARGET = meshcvt
 
-CONFIG += qt3d
+QT += qt3d
 
 SOURCES += \
     meshcvt.cpp \
diff --git a/util/qt3d/qglinfo/qglinfo.pro b/util/qt3d/qglinfo/qglinfo.pro
index 423b0291e..f792bb6ea 100644
--- a/util/qt3d/qglinfo/qglinfo.pro
+++ b/util/qt3d/qglinfo/qglinfo.pro
@@ -1,8 +1,5 @@
 TARGET = qglinfo
-!package: CONFIG += qt3d
-
-CONFIG += qt3d_deploy_pkg
-include(../../../pkg.pri)
+QT += qt3d widgets
 
 SOURCES += main.cpp \
     qglinfowindow.cpp \
@@ -24,3 +21,7 @@ OTHER_FILES += \
     qglinfo.rc
 
 RC_FILE = qglinfo.rc
+
+DESTDIR = $$QT.qt3d.bins
+target.path = $$[QT_INSTALL_BINS]
+INSTALLS += target
diff --git a/util/qt3d/qt3d.pro b/util/qt3d/qt3d.pro
index bef37965f..73438b6c0 100644
--- a/util/qt3d/qt3d.pro
+++ b/util/qt3d/qt3d.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS = qglinfo
+contains(QT_CONFIG, widgets): SUBDIRS += qglinfo