Integrate Qt3D into Qt5 and fix some qdoc errors.

This doc change by 'integrating into Qt5' also made some changes to the
build system, so that now you need QT+=3d everywhere (instead of
QT+=qt3d as it was previously).

We have been asked to make this change, and it seems it is required for
this doc system to work, so lets get it done.

Note that the original change had a docsnippets target but that did not
work at all and will have be done in a later commit.

Change-Id: Icf4bc6b4be9494f1752e18ca1f5198c8fe8ecf53
Reviewed-by: Danny Pope <daniel.pope@nokia.com>

99 files changed, 246 insertions, 207 deletions

diff --git a/demos/qt3d/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro
index 5fb35a606..1bd96cf80 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
-QT += qt3d
+QT += 3d
 
 include (../../../pkg.pri)
 
diff --git a/demos/qt3d/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro
index beec3b279..8dc0ba588 100644
--- a/demos/qt3d/pageflip/pageflip.pro
+++ b/demos/qt3d/pageflip/pageflip.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = pageflip
 CONFIG += qt warn_on
-QT += qt3d
+QT += 3d
 
 include(../../../pkg.pri)
 
diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro
index 7d4a30242..83eb2156f 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3d.pro
+++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = photobrowser3d
 CONFIG += qt warn_on
-QT += qt3d
+QT += 3d
 
 include (../../../pkg.pri)
 
diff --git a/demos/qt3d/shapes/shapes.pro b/demos/qt3d/shapes/shapes.pro
index 66645bcbf..c2e3e89dc 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
-QT += qt3d
+QT += 3d
 
 include (../../../pkg.pri)
 
diff --git a/demos/qt3d/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro
index d2d19f4ae..60d469f25 100644
--- a/demos/qt3d/teaservice/teaservice.pro
+++ b/demos/qt3d/teaservice/teaservice.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = teaservice
 CONFIG += qt warn_on
-QT += qt3d
+QT += 3d
 
 include (../../../pkg.pri)
 
diff --git a/doc/src/camera-frustum.qdoc b/doc/src/camera-frustum.qdoc
index 4fe24dca8..edc87b816 100644
--- a/doc/src/camera-frustum.qdoc
+++ b/doc/src/camera-frustum.qdoc
@@ -88,7 +88,7 @@
 
     This screen capture from a 3D modelling program shows how this camera is
     set up in a scene, where its viewing a cube.  The image shows a purple area
-    which indicates the \i{view frustum}, which you can think of for
+    which indicates the \e{view frustum}, which you can think of for
     now as the area captured by the camera.  Actually its more correct to think
     of the volume captured by the camera, and imagine that the purple indication
     in the image is the shadow cast by this volume.
diff --git a/doc/src/examples/basket.qdoc b/doc/src/examples/basket.qdoc
index 991aa8594..e8acf91f2 100644
--- a/doc/src/examples/basket.qdoc
+++ b/doc/src/examples/basket.qdoc
@@ -29,39 +29,40 @@
     \example quick3d/basket
     \title Basket Example
 
+    \target Basket in QML
     \section2 Basket in QML
 
     The QML version of the basket example is very similar in
     structure to the C++ version above, but much simpler.
     We start by defining a viewport with a specific camera position:
 
-    \snippet quick3d/basket/qml/basket.qml 1
+    \snippet ../../examples/quick3d/basket/qml/basket.qml 1
 
     We then add an \l Item3D object to load the basket model and
     apply the desired texture to it:
 
-    \snippet quick3d/basket/qml/basket.qml 2
+    \snippet ../../examples/quick3d/basket/qml/basket.qml 2
 
     And then we apply an animation to the rotation component of
     the item's transform property:
 
-    \snippet quick3d/basket/qml/basket.qml 3
+    \snippet ../../examples/quick3d/basket/qml/basket.qml 3
 
-    \section2 Basket in Qt3D 
+    \section2 Basket in Qt3D
 
     The Basket example shows how Qt3D can be used to draw an animated
     object covered in a texture.  The basic application shell is similar
     to the \l{qt3d/teapot}{Hello Teapot} example.  In this case, we create
     the basket object and add a texture to it as follows:
 
-    \snippet qt3d/basket/basketview.cpp 1
+    \snippet ../../examples/qt3d/basket/basketview.cpp 1
 
     For this animation, we want to spin the basket around its Y axis,
     once every 2 seconds.  We first declare an \c angle property in the
     class declaration (calling \c{update()} will force the view to
     redraw whenever the angle changes):
 
-    \snippet qt3d/basket/basketview.h 1
+    \snippet ../../examples/qt3d/basket/basketview.h 1
 
     Then we create a QPropertyAnimation object that will update
     \c angle every time through the event loop with a new value
@@ -72,7 +73,7 @@
     Now all we have to do is draw the basket using the \c angle
     property every time \c{paintGL()} is called:
 
-    \snippet qt3d/basket/basketview.cpp 3
+    \snippet ../../examples/qt3d/basket/basketview.cpp 3
 
     \image basket-screenshot.png
 
diff --git a/doc/src/examples/teapot-qml.qdoc b/doc/src/examples/teapot-qml.qdoc
index 8217d9ad8..db5bce16f 100644
--- a/doc/src/examples/teapot-qml.qdoc
+++ b/doc/src/examples/teapot-qml.qdoc
@@ -32,22 +32,22 @@
     This example shows to use QML in Qt3D to display a teapot on
     the screen.  The QML is fairly simple:
 
-    \snippet quick3d/teapot_qml/qml/teapot.qml 1
+    \snippet ../../tutorials/quick3d/teapot_qml/qml/teapot.qml 1
 
     \image teapot-qml-screenshot.png
 
     The example starts by importing the Qt and Qt3D QML modules:
 
-    \snippet quick3d/teapot_qml/qml/teapot.qml 2
+    \snippet ../../tutorials/quick3d/teapot_qml/qml/teapot.qml 2
 
     Then we create a viewport of size 640x480 to display the teapot:
 
-    \snippet quick3d/teapot_qml/qml/teapot.qml 3
+    \snippet ../../tutorials/quick3d/teapot_qml/qml/teapot.qml 3
 
     And now we create a \l Item3D to display the teapot with a
     default lit material effect:
 
-    \snippet quick3d/teapot_qml/qml/teapot.qml 4
+    \snippet ../../tutorials/quick3d/teapot_qml/qml/teapot.qml 4
 
     The teapot data itself is loaded from \c{teapot.bez}, which contains
     Bezier patch data that describes the geometry of the teapot.
@@ -55,15 +55,15 @@
     Let's make the teapot a little more interesting by adding a
     material to simulate bone china:
 
-    \snippet quick3d/teapot_bounce_qml/qml/teapot-bounce.qml 1
-    \snippet quick3d/teapot_bounce_qml/qml/teapot-bounce.qml 2
+    \snippet ../../tutorials/quick3d/teapot_bounce_qml/qml/teapot-bounce.qml 1
+    \snippet ../../tutorials/quick3d/teapot_bounce_qml/qml/teapot-bounce.qml 2
 
     \image teapot-china-screenshot.png
 
     To make the teapot even more interesting, we can cause it to
     bounce up and down using a QML animation item:
 
-    \snippet quick3d/teapot_bounce_qml/qml/teapot-bounce.qml 3
+    \snippet ../../tutorials/quick3d/teapot_bounce_qml/qml/teapot-bounce.qml 3
 
     This QML teapot example can be compared with the \l{qt3d/teapot}{C++ version}.
     Using QML is briefer than C++, and easier to modify to adjust
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index b4fc75cf4..ff190f8db 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -27,9 +27,13 @@
 
 /*!
     \page index.html
-    \title Qt3D Introduction and Overview
-    \keyword Qt3D Introduction Overview
+    \title Qt3D
+    \keyword Qt3D Introduction Overview Documentation
+    \brief The Qt 3D module provides a set of APIs to make 3D graphics programming easy and declarative.
 
+    \ingroup technology-apis
+
+    \section1 Overview
 
     \section1 What is Qt 3D?
     The Qt 3D module provides a set of APIs to make 3D graphics programming easy and declarative. Seamless integration
@@ -149,29 +153,29 @@
     \list
     \o \l {qt3d-building.html}{Building}
     \o \l {qt3d-examples.html}{Tutorials and Examples}
-    \o \l {sceneformats-obj.html}{Scene format plug-ins}
-    \o \l {qgl.html}{QGL Namespace}
+    \o \l {Writing a scene format plug-in for Qt3D}{Scene format plug-ins}
+    \o \l {QGL}{QGL Namespace}
     \o \l {qt3d-acceptance.html}{Acceptance tests}
     \o \l {qt3d-troubleshooting.html}{Troubleshooting Qt3D}
     \endlist
 
     \section1 Qt3D Core Concepts
     \list
-    \o \l {qt3d-arrays.html}{Arrays and Vertex Buffers}
-    \o \l {qt3d-geometry.html}{Geometry Building}
-    \o \l {qt3d-graphicsview.html}{Graphics View Integration}
-    \o \l {qt3d-materials.html}{Materials}
-    \o \l {qt3d-math.html}{Mathematical Primitives}
-    \o \l {qt3d-painting.html}{Painting in 3D}
-    \o \l {qt3d-scene.html}{Scene Management}
-    \o \l {qt3d-textures.html}{Texture Management}
-    \o \l {qt3d-viewing.html}{Viewing Widgets}
+    \o \l {Qt3D Arrays and Vertex Buffers}{Arrays and Vertex Buffers}
+    \o \l {Qt3D Geometry}{Geometry Building}
+    \o \l {Qt3D Graphics View Integration}{Graphics View Integration}
+    \o \l {Qt3D Materials}{Materials}
+    \o \l {Qt3D Math}{Mathematical Primitives}
+    \o \l {Qt3D Painting}{Painting in 3D}
+    \o \l {Qt3D Scene Management}{Scene Management}
+    \o \l {Qt3D Texture Handling}{Texture Management}
+    \o \l {Qt3D Viewing}{Viewing Widgets}
     \endlist
 
     \section1 API Reference documentation
     \list
-    \o \l {qt3d-all-classes.html}{C++ APIs}
-    \o \l {qt3d-qml3d.html}{QML APIs}
+    \o \l {Qt3D Classes}{C++ APIs}
+    \o \l {Qt3D for Scripting 3D Apps in QML}{QML APIs}
     \endlist
 
     \section1 Extending Qt 3D
diff --git a/doc/src/qline3d-math.qdoc b/doc/src/qline3d-math.qdoc
index 3f7991ef0..543a530f8 100644
--- a/doc/src/qline3d-math.qdoc
+++ b/doc/src/qline3d-math.qdoc
@@ -57,11 +57,11 @@
 
     But there are important differences between points and vectors:
     \list
-    \o a point \bold P is a 3D \i location, and makes sense in terms of a 3D cartesian
+    \o a point \bold P is a 3D \e location, and makes sense in terms of a 3D cartesian
         coordinate system.  A real-world example is a map-location given in terms
         of a map cross-reference.  The location has no inherent magnitude, unless you
         provide another location and find the distance between the two.
-    \o a vector \bold v is a 3D \i direction and magnitude.  It makes no sense to talk
+    \o a vector \bold v is a 3D \e direction and magnitude.  It makes no sense to talk
         about a vector being located somewhere.  A vector can represent for example
         some directions like "go 3 north-west 3 kilometers", but this can be done from
         \bold {anywhere on the map} - it is not anchored like the point is.
@@ -120,7 +120,7 @@
     Vectors used for 3D normals are usually normalized to unit length.  Confusingly
     enough, since that is two different uses of the word "normal".
 
-    A \i normal is simply a vector perpendicular to something.  For example a plane normal is
+    A \e normal is simply a vector perpendicular to something.  For example a plane normal is
     perpendicular to the plane.
 
     Typically a normal vector is unit length, for convenience in 3D applications (but
@@ -136,14 +136,14 @@
     \list
     \o QVector3D::crossProduct(const QVector3D &, const QVector3D &)
         \list
-        \o The cross-product of two vectors produces a \i vector as a result and is
+        \o The cross-product of two vectors produces a \e vector as a result and is
         written \bold w = \bold u x \bold v. The result \bold w is perpendicular to both
         \bold u and \bold v.  Consider a plane N containing point P, with the tails of \bold u
         and \bold v at P, and both lying in N, then \bold u x \bold v is a normal to N.
         \endlist
     \o QVector3D::dotProduct(const QVector3D &, const QVector3D &)
         \list
-        \o The dot-product of two vectors produces a \i scalar as a result and is written
+        \o The dot-product of two vectors produces a \e scalar as a result and is written
         \c{t = \bold u . \bold v}.  The result t = |u| |v| cos(A), where A is the angle
         between u and v.  When \bold u and \bold v have magnitude 1, they are called
         unit vectors, and \bold u . \bold v = cos(A).
diff --git a/doc/src/qt3d-all-classes.qdoc b/doc/src/qt3d-all-classes.qdoc
index fc6bfff64..1e3c24653 100644
--- a/doc/src/qt3d-all-classes.qdoc
+++ b/doc/src/qt3d-all-classes.qdoc
@@ -42,7 +42,7 @@
 
 /*!
     \page qt3d-all-namespaces.html
-    \title All Namespaces
+    \title Qt3D Namespaces
     \keyword All Namespaces
 
     \l{QGL}{QGL Namespace}
diff --git a/doc/src/qt3d-all-modules.qdoc b/doc/src/qt3d-all-modules.qdoc
index e240ed7d4..f82964c03 100644
--- a/doc/src/qt3d-all-modules.qdoc
+++ b/doc/src/qt3d-all-modules.qdoc
@@ -27,8 +27,8 @@
 
 /*!
     \page qt3d-modules.html
-    \title All Modules
-    \keyword All Modules
+    \title Qt3D Modules
+    \keyword Qt3D Modules
 
     \raw HTML
         <table cellpadding="2" cellspacing="1" border="0" width="100%" class="indextable">
diff --git a/doc/src/qt3d-examples.qdoc b/doc/src/qt3d-examples.qdoc
index 0f7576ca6..45d1abd4c 100644
--- a/doc/src/qt3d-examples.qdoc
+++ b/doc/src/qt3d-examples.qdoc
@@ -34,7 +34,7 @@
 
     \list
     \o \l{Teapot Example in QML}{Hello Teapot} in Qt3D
-    \o \l{qt3d/basket#Basket in QML}{Basket} in Qt3D
+    \o \l{Basket Example#Basket in QML}{Basket} in Qt3D
     \o \l{Object Effects}{Cube} in Qt3D
     \o \l{Monkey God in QML}{Monkey God} in Qt3D
     \o \l{Tea Service Demo in QML}{Tea Service} in Qt3D
diff --git a/doc/src/tutorials/penguin.qdoc b/doc/src/tutorials/penguin.qdoc
index 8d019e34b..7536bc732 100644
--- a/doc/src/tutorials/penguin.qdoc
+++ b/doc/src/tutorials/penguin.qdoc
@@ -36,7 +36,7 @@
     We start by defining a class that inherits from QGLView, which
     provides some basic scene setup logic and 3D camera navigation:
 
-    \snippet qt3d/penguin/modelview.h class-defn
+    \snippet ../../examples/qt3d/penguin/modelview.h class-defn
 
     Refer first to the \l{Teapot Example} for the basics of using
     the QGLView class, lighting and so on.
@@ -45,12 +45,12 @@
     resource file, and store the result in a member variable, so
     we can refer to it in the paint function:
 
-    \snippet qt3d/penguin/modelview.cpp initialize
+    \snippet ../../examples/qt3d/penguin/modelview.cpp initialize
 
     In the teapot example we had to specify appropriate effects but
     the model loader sets appropriate effects on the scene for us.
 
-    \snippet qt3d/penguin/modelview.cpp paint
+    \snippet ../../examples/qt3d/penguin/modelview.cpp paint
 
     Here in the paint function we call the \c{draw()} function of
     the scene's main object, in order to display the fully
@@ -72,7 +72,7 @@
     Let's make a few changes to have our penguin display nicely
     when the application opens.
 
-    \snippet qt3d/penguin_advanced/modelview.cpp initialize
+    \snippet ../../examples/qt3d/penguin_advanced/modelview.cpp initialize
 
     First of all, let move the camera away from the penguin and up
     so he fits in the frame and we can get a better angle on him,
@@ -95,7 +95,7 @@
     calculated and stored as a quaternion - we want the x twist first
     so that goes last in the product of the two quaternions.
 
-    \snippet qt3d/penguin_advanced/modelview.cpp paint
+    \snippet ../../examples/qt3d/penguin_advanced/modelview.cpp paint
 
     Now all that remains in the updated paint function is to apply the
     new pose, and then paint the penguin.
diff --git a/doc/src/tutorials/sceneformat.qdoc b/doc/src/tutorials/sceneformat.qdoc
index b4b292b14..f724776ac 100644
--- a/doc/src/tutorials/sceneformat.qdoc
+++ b/doc/src/tutorials/sceneformat.qdoc
@@ -43,7 +43,7 @@
     We start by declaring an instance of QGLSceneFormatPlugin and
     arranging for it to be registered with the Qt plug-in system:
 
-    \snippet sceneformats/obj/main.cpp 1
+    \snippet ../../esceneformats/obj/main.cpp 1
     \snippet sceneformats/obj/main.cpp 4
 
     The two functions we need to implement are
diff --git a/doc/src/tutorials/simpleobject.qdoc b/doc/src/tutorials/simpleobject.qdoc
index 28e967150..ceb634844 100644
--- a/doc/src/tutorials/simpleobject.qdoc
+++ b/doc/src/tutorials/simpleobject.qdoc
@@ -38,14 +38,14 @@
 
     It is quite simple to achieve these effects in Qt3D:
 
-    \snippet quick3d/cube/qml/cube.qml 1
+    \snippet ../../examples/quick3d/cube/qml/cube.qml 1
 
     \section2 Cube in C++
 
     In the C++ side of Qt3D we start by declaring a view class to show our cube
     on the screen:
 
-    \snippet qt3d/cube1/cubeview.h 1
+    \snippet ../../examples/qt3d/cube1/cubeview.h 1
 
     QGLView provides most of the logic for initializing the view,
     setting the camera position, and handling navigation via
@@ -53,12 +53,12 @@
     QGLBuilder to create the geometry for the cube object that
     we will be using in later steps:
 
-    \snippet qt3d/cube1/cubeview.cpp 1
+    \snippet ../../examples/qt3d/cube1/cubeview.cpp 1
 
     Then it is a simple matter to draw the object in our \c{paintGL()}
     method:
 
-    \snippet qt3d/cube1/cubeview.cpp 2
+    \snippet ../../examples/qt3d/cube1/cubeview.cpp 2
 
     If we run the program now, we get the following output, which isn't
     very cube-like:
@@ -71,7 +71,7 @@
     matrix a little bit to apply a 45 degree rotation around the
     axis (1, 1, 1):
 
-    \snippet qt3d/cube2/cubeview.cpp 2
+    \snippet ../../examples/qt3d/cube2/cubeview.cpp 2
 
     Now the results are a little better:
 
@@ -83,7 +83,7 @@
     (white in this case).  So let's change to a lit material effect
     with a nice green color:
 
-    \snippet qt3d/cube3/cubeview.cpp 2
+    \snippet ../../examples/qt3d/cube3/cubeview.cpp 2
 
     That's much better; now it looks like a cube:
 
@@ -92,13 +92,13 @@
     To complete this tutorial, let's make the cube a little more
     interesting by adding a texture to the side:
 
-    \snippet qt3d/cube4/cubeview.h 1
+    \snippet ../../examples/qt3d/cube4/cubeview.h 1
     \dots
-    \snippet qt3d/cube4/cubeview.h 2
-    \snippet qt3d/cube4/cubeview.cpp 1
+    \snippet ../../examples/qt3d/cube4/cubeview.h 2
+    \snippet ../../examples/qt3d/cube4/cubeview.cpp 1
     \dots
-    \snippet qt3d/cube4/cubeview.cpp 2
-    \snippet qt3d/cube4/cubeview.cpp 3
+    \snippet ../../examples/qt3d/cube4/cubeview.cpp 2
+    \snippet ../../examples/qt3d/cube4/cubeview.cpp 3
 
     \image tutorials/cube4-screenshot.png
 
diff --git a/examples/qt3d/basket/basket.pro b/examples/qt3d/basket/basket.pro
index 4c6abf41c..27f11d281 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
-QT += qt3d
+QT += 3d
 
 include(../../../pkg.pri)
 
diff --git a/examples/qt3d/builder/builder.pro b/examples/qt3d/builder/builder.pro
index ee52c5e94..b820221a8 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
 
-QT += qt3d
+QT += 3d
 
 include(../../../pkg.pri)
 
diff --git a/examples/qt3d/cube/cube.pro b/examples/qt3d/cube/cube.pro
index 3658fe493..7eae07d91 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
-QT += qt3d
+QT += 3d
 
 include(../../../pkg.pri)
 
diff --git a/examples/qt3d/cylinder/cylinder.pro b/examples/qt3d/cylinder/cylinder.pro
index b273b94dd..03cb2cc5f 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
-QT += qt3d
+QT += 3d
 
 include(../../../pkg.pri)
 
diff --git a/examples/qt3d/geometry/geometry.pro b/examples/qt3d/geometry/geometry.pro
index 35ff6db86..19216a6f6 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
-QT += qt3d
+QT += 3d
 
 include(../../../pkg.pri)
 
diff --git a/examples/qt3d/nesting/nesting.pro b/examples/qt3d/nesting/nesting.pro
index 7fee293db..fc1aba7da 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
-QT += qt3d
+QT += 3d
 
 include(../../../pkg.pri)
 
diff --git a/examples/qt3d/solarsystem/solarsystem.pro b/examples/qt3d/solarsystem/solarsystem.pro
index dc6750c5e..53fe5106c 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
-QT += qt3d
+QT += 3d
 
 include(../../../pkg.pri)
 
diff --git a/examples/qt3d/tank/tank.pro b/examples/qt3d/tank/tank.pro
index b2d850886..820feb798 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
-QT += qt3d
+QT += 3d
 
 include(../../../pkg.pri)
 
diff --git a/examples/qt3d/teapot/teapot.pro b/examples/qt3d/teapot/teapot.pro
index f0f118278..13c3dc89e 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
-QT += qt3d
+QT += 3d
 
 include(../../../pkg.pri)
 
diff --git a/modules/qt_qt3d.pri b/modules/qt_qt3d.pri
index f3c733bb2..2c7d2308e 100644
--- a/modules/qt_qt3d.pri
+++ b/modules/qt_qt3d.pri
@@ -1,17 +1,17 @@
-QT.qt3d.VERSION = 5.0.0
-QT.qt3d.MAJOR_VERSION = 5
-QT.qt3d.MINOR_VERSION = 0
-QT.qt3d.PATCH_VERSION = 0
+QT.3d.VERSION = 5.0.0
+QT.3d.MAJOR_VERSION = 5
+QT.3d.MINOR_VERSION = 0
+QT.3d.PATCH_VERSION = 0
 
-QT.qt3d.name = Qt3D
-QT.qt3d.bins = $$QT_MODULE_BIN_BASE
-QT.qt3d.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt3D
-QT.qt3d.private_includes = $$QT_MODULE_INCLUDE_BASE/Qt3D/$$QT.qt3d.VERSION
-QT.qt3d.sources = $$QT_MODULE_BASE/src/threed
-QT.qt3d.libs = $$QT_MODULE_LIB_BASE
-QT.qt3d.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.qt3d.imports = $$QT_MODULE_IMPORT_BASE
-QT.qt3d.depends = gui
-QT.qt3d.DEFINES = QT_QT3D_LIB
+QT.3d.name = Qt3D
+QT.3d.bins = $$QT_MODULE_BIN_BASE
+QT.3d.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt3D
+QT.3d.private_includes = $$QT_MODULE_INCLUDE_BASE/Qt3D/$$QT.3d.VERSION
+QT.3d.sources = $$QT_MODULE_BASE/src/threed
+QT.3d.libs = $$QT_MODULE_LIB_BASE
+QT.3d.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.3d.imports = $$QT_MODULE_IMPORT_BASE
+QT.3d.depends = gui
+QT.3d.DEFINES = QT_QT3D_LIB
 
-QT_CONFIG += qt3d
+QT_CONFIG += 3d
diff --git a/modules/qt_qt3dquick.pri b/modules/qt_qt3dquick.pri
index 375d809c8..d4cc6032b 100644
--- a/modules/qt_qt3dquick.pri
+++ b/modules/qt_qt3dquick.pri
@@ -1,17 +1,17 @@
-QT.qt3dquick.VERSION = 5.0.0
-QT.qt3dquick.MAJOR_VERSION = 5
-QT.qt3dquick.MINOR_VERSION = 0
-QT.qt3dquick.PATCH_VERSION = 0
+QT.3dquick.VERSION = 5.0.0
+QT.3dquick.MAJOR_VERSION = 5
+QT.3dquick.MINOR_VERSION = 0
+QT.3dquick.PATCH_VERSION = 0
 
-QT.qt3dquick.name = Qt3DQuick
-QT.qt3dquick.bins = $$QT_MODULE_BIN_BASE
-QT.qt3dquick.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt3DQuick
-QT.qt3dquick.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSensors/$$QT.quick3d.VERSION
-QT.qt3dquick.sources = $$QT_MODULE_BASE/src/quick3d
-QT.qt3dquick.libs = $$QT_MODULE_LIB_BASE
-QT.qt3dquick.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.qt3dquick.imports = $$QT_MODULE_IMPORT_BASE
-QT.qt3dquick.depends = gui quick declarative network
-QT.qt3dquick.DEFINES = QT_QT3DQUICK_LIB
+QT.3dquick.name = Qt3DQuick
+QT.3dquick.bins = $$QT_MODULE_BIN_BASE
+QT.3dquick.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt3DQuick
+QT.3dquick.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSensors/$$QT.quick3d.VERSION
+QT.3dquick.sources = $$QT_MODULE_BASE/src/quick3d
+QT.3dquick.libs = $$QT_MODULE_LIB_BASE
+QT.3dquick.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.3dquick.imports = $$QT_MODULE_IMPORT_BASE
+QT.3dquick.depends = gui quick declarative network
+QT.3dquick.DEFINES = QT_QT3DQUICK_LIB
 
-QT_CONFIG += qt3dquick
+QT_CONFIG += 3dquick
diff --git a/qt3d.pro b/qt3d.pro
index feea17aee..ba837474b 100644
--- a/qt3d.pro
+++ b/qt3d.pro
@@ -1,12 +1,46 @@
 TEMPLATE = subdirs
-SUBDIRS += src
-!gcov: SUBDIRS += util examples demos
 
-!package: SUBDIRS += tutorials
+module_qt3d_src.subdir = src
+module_qt3d_src.target = module-qt3d-src
 
-tests.CONFIG = no_default_install
-SUBDIRS += tests
-CONFIG += ordered
+module_qt3d_examples.subdir = examples
+module_qt3d_examples.target = module-qt3d-examples
+module_qt3d_examples.depends = module_qt3d_src
+!contains(QT_BUILD_PARTS,examples) {
+    module_qt3d_examples.CONFIG = no_default_target no_default_install
+}
+
+module_qt3d_demos.subdir = demos
+module_qt3d_demos.target = module-qt3d-demos
+module_qt3d_demos.depends = module_qt3d_src
+!contains(QT_BUILD_PARTS,examples) {
+    module_qt3d_demos.CONFIG = no_default_target no_default_install
+}
+
+module_qt3d_tutorials.subdir = tutorials
+module_qt3d_tutorials.target = module-qt3d-tutorials
+module_qt3d_tutorials.depends = module_qt3d_src
+module_qt3d_tutorials.CONFIG = no_default_target no_default_install
+
+module_qt3d_tests.subdir = tests
+module_qt3d_tests.target = module-qt3d-tests
+module_qt3d_tests.depends = module_qt3d_src
+module_qt3d_tests.CONFIG = no_default_install
+!contains(QT_BUILD_PARTS,tests):module_qt3d_tests.CONFIG += no_default_target
+
+module_qt3d_util.subdir = util
+module_qt3d_util.target = module-qt3d-util
+module_qt3d_util.depends = module_qt3d_src
+module_qt3d_util.CONFIG = no_default_target no_default_install
+
+SUBDIRS += module_qt3d_src \
+           module_qt3d_examples \
+           module_qt3d_demos \
+           module_qt3d_tests
+
+!package: SUBDIRS += module_qt3d_tutorials
+
+!gcov: SUBDIRS += module_qt3d_util
 
 include(doc/doc.pri)
 
diff --git a/src/imports/shapes/shapes.pro b/src/imports/shapes/shapes.pro
index b531ec54b..06a67dac2 100644
--- a/src/imports/shapes/shapes.pro
+++ b/src/imports/shapes/shapes.pro
@@ -2,9 +2,9 @@ TEMPLATE = lib
 TARGET  = qshapesqmlplugin
 CONFIG += qt plugin
 
-QT += declarative quick qt3d qt3dquick
+QT += declarative quick 3d 3dquick
 
-DESTDIR = $$QT.qt3dquick.imports/Qt3D/Shapes
+DESTDIR = $$QT.3dquick.imports/Qt3D/Shapes
 target.path = $$[QT_INSTALL_IMPORTS]/Qt3D/Shapes
 INSTALLS += target
 
diff --git a/src/imports/threed/threed.pro b/src/imports/threed/threed.pro
index ca766683d..e9cf62d54 100644
--- a/src/imports/threed/threed.pro
+++ b/src/imports/threed/threed.pro
@@ -2,9 +2,9 @@ TEMPLATE = lib
 TARGET  = qthreedqmlplugin
 CONFIG += qt plugin
 
-QT += quick declarative qt3d qt3dquick
+QT += quick declarative 3d 3dquick
 
-DESTDIR = $$QT.qt3dquick.imports/Qt3D
+DESTDIR = $$QT.3dquick.imports/Qt3D
 target.path = $$[QT_INSTALL_IMPORTS]/Qt3D
 INSTALLS += target
 
diff --git a/src/plugins/sceneformats/3ds/3ds.pro b/src/plugins/sceneformats/3ds/3ds.pro
index 78d4c44d6..c7016f2bb 100644
--- a/src/plugins/sceneformats/3ds/3ds.pro
+++ b/src/plugins/sceneformats/3ds/3ds.pro
@@ -10,9 +10,9 @@ SOURCES += main.cpp \
     qgl3dsscenehandler.cpp \
     qgl3dsmesh.cpp
 
-QT += qt3d
+QT += 3d
 
-DESTDIR = $$QT.qt3d.plugins/sceneformats
+DESTDIR = $$QT.3d.plugins/sceneformats
 target.path = $$[QT_INSTALL_PLUGINS]/sceneformats
 INSTALLS += target
 
diff --git a/src/plugins/sceneformats/assimp/assimp.pro b/src/plugins/sceneformats/assimp/assimp.pro
index 2f6dcc13f..39fbb5454 100644
--- a/src/plugins/sceneformats/assimp/assimp.pro
+++ b/src/plugins/sceneformats/assimp/assimp.pro
@@ -14,9 +14,9 @@ SOURCES += main.cpp \
     ailoaderiostream.cpp \
     ailoaderiosystem.cpp
 
-QT += qt3d
+QT += 3d
 
-DESTDIR = $$QT.qt3d.plugins/sceneformats
+DESTDIR = $$QT.3d.plugins/sceneformats
 target.path = $$[QT_INSTALL_PLUGINS]/sceneformats
 INSTALLS += target
 
diff --git a/src/plugins/sceneformats/bezier/bezier.pro b/src/plugins/sceneformats/bezier/bezier.pro
index 50acdb3a5..911dc60ef 100644
--- a/src/plugins/sceneformats/bezier/bezier.pro
+++ b/src/plugins/sceneformats/bezier/bezier.pro
@@ -7,8 +7,8 @@ SOURCES += main.cpp \
            qglbezierscene.cpp \
            qglbezierscenehandler.cpp
 
-QT += qt3d
+QT += 3d
 
-DESTDIR = $$QT.qt3d.plugins/sceneformats
+DESTDIR = $$QT.3d.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 2590f3d4d..c20cc91f3 100644
--- a/src/plugins/sceneformats/obj/obj.pro
+++ b/src/plugins/sceneformats/obj/obj.pro
@@ -7,8 +7,8 @@ SOURCES += main.cpp \
            qglobjscene.cpp \
            qglobjscenehandler.cpp
 
-QT += qt3d
+QT += 3d
 
-DESTDIR = $$QT.qt3d.plugins/sceneformats
+DESTDIR = $$QT.3d.plugins/sceneformats
 target.path = $$[QT_INSTALL_PLUGINS]/sceneformats
 INSTALLS += target
diff --git a/src/quick3d/qdeclarativeitem3d.cpp b/src/quick3d/qdeclarativeitem3d.cpp
index cc178330d..18a87515d 100644
--- a/src/quick3d/qdeclarativeitem3d.cpp
+++ b/src/quick3d/qdeclarativeitem3d.cpp
@@ -80,7 +80,7 @@
     }
     \endcode
 
-    This simple code will create a 3D item based on the \i teapot.bez mesh using
+    This simple code will create a 3D item based on the \e teapot.bez mesh using
     back-face culling.
 
     Notice that in this case the effect and mesh are defined within the body of
@@ -110,7 +110,7 @@
     \endcode
 
     This demonstrates the capability of embedding one Item3D within another.  In
-    this case the \i saucer item is a child of the \i cup item.
+    this case the \e saucer item is a child of the \e cup item.
 
     All transformations applied to the parent item are also applied to the child,
     so in this case both the cup and saucer will be translated based on the
@@ -197,7 +197,7 @@
     \endcode
 
     Obviously this example is much more complex both in structure and behaviour. In
-    this case the mesh describes a \i .3ds file of a helicoptor, which is broken down
+    this case the mesh describes a \e .3ds file of a helicoptor, which is broken down
     discrete sub-components (engine nacelles, rotor, rotor hub, etc), which the user
     may wish to modify or animate individually.
 
@@ -207,14 +207,14 @@
 
     All transformations carried out on the parent item will also be applied to the child.
 
-    Child items can, as shown here, have their own \i local transformations and user
+    Child items can, as shown here, have their own \e local transformations and user
     interactions applied.  These will be applied only to the node of the mesh which
     is defined for that item.  In cases where the mesh is defined heirarchically as a
     tree of nodes, this transformation will therefore be applied to all items in that
     tree which are children of the defined node.
 
     Likewise if the user explicitly declares a child item, such as has been done here with
-    the \i rotorHubNode, then the transformations will apply to this item as well (and
+    the \e rotorHubNode, then the transformations will apply to this item as well (and
     its children, and so on).
 
     It should be noted that no support is currently provided for skeleton animation or
@@ -233,21 +233,21 @@
     that Item3D based delegates hide themselves when their index is
     -1 as shown in the photoroom example:
 
-    \snippet quick3d/photoroom/qml/photoroom.qml 1
+    \snippet ../../examples/quick3d/photoroom/qml/photoroom.qml 1
 
     However Item3D does not use the width or height properties, so most
     positioners and views will not work.  Use a
     \l{http://doc.qt.nokia.com/4.7/qml-repeater.html}{Repeater} element to
     generate Item3Ds from model data.  For example:
 
-    \snippet quick3d/photoroom/qml/photoroom.qml 2
+    \snippet ../../examples/quick3d/photoroom/qml/photoroom.qml 2
 
     Models can be used normally, so
 \l{http://doc.qt.nokia.com/4.7/qdeclarativemodels.html#listmodel}{ListModel},
 \l{http://doc.qt.nokia.com/4.7/qdeclarativemodels.html#qstringlist}{QStringList}
     etc. work just like they would with two dimensional Items.  For example:
 
-    \snippet quick3d/photoroom/qml/photoroom.qml 0
+    \snippet ../../examples/quick3d/photoroom/qml/photoroom.qml 0
 
     \sa{http://doc.qt.nokia.com/4.7/qdeclarativemodels.html#qml-data-models}{QML Data Models}
 */
@@ -855,8 +855,8 @@ void QDeclarativeItem3D::setInheritEvents(bool inherit)
 
     Objects in most 3D environments are almost invariably defined as meshes - sets of
     vertices which when linked as polygons form a recognisable 3D object.  Qt3D currently
-    supports a number of these \i {scene formats}, including \i {.obj} file, bezier patches
-    \i {(.bez)}, and \i {.3ds} files.
+    supports a number of these \e {scene formats}, including \e {.obj} file, bezier patches
+    \e {(.bez)}, and \e {.3ds} files.
 
     These meshes are abstracted into the \l Mesh class, which is defined for
     an \l Item3D through this property.
@@ -1263,13 +1263,13 @@ void QDeclarativeItem3D::drawChildren(QGLPainter *painter)
     graphics libraries.  Essentially it is a stepwise progress through the following stages:
 
     \list
-    \i 1. Iterate through the child objects of the item and set all lighting parameters found.
-    \i 2. Set up culling mode in the painter.
-    \i 3. Set effects if they exist.
-    \i 4. Set all local model view transformations for this item.
-    \i 5. Draw this item.
-    \i 6. Iterate through the child objects of the item and draw all child items.
-    \i 7. Unset the appropriate parameters and states.
+    \o 1. Iterate through the child objects of the item and set all lighting parameters found.
+    \o 2. Set up culling mode in the painter.
+    \o 3. Set effects if they exist.
+    \o 4. Set all local model view transformations for this item.
+    \o 5. Draw this item.
+    \o 6. Iterate through the child objects of the item and draw all child items.
+    \o 7. Unset the appropriate parameters and states.
     \endlist
 
 
@@ -1326,7 +1326,7 @@ void QDeclarativeViewport::setItemViewport(QDeclarativeItem3D *item)
     The process of initialising an /l Object3d is a critical step, particularly in
     complex scenes.  This function initialises the item in \a viewport, and using \a painter.
 
-    During the initialisation process objects are registered as being \i pickable (ie. able
+    During the initialisation process objects are registered as being \e pickable (ie. able
     to be clicked on with the mouse.
 
     Additionally, in the case of \l Item3D objects which refer to sub-nodes of a mesh, this
diff --git a/src/quick3d/qdeclarativemesh.cpp b/src/quick3d/qdeclarativemesh.cpp
index ee9696e62..56b3c8f2a 100644
--- a/src/quick3d/qdeclarativemesh.cpp
+++ b/src/quick3d/qdeclarativemesh.cpp
@@ -64,7 +64,7 @@
     QML/3d Mesh objects are a QML enabled means of representing any scene class based
     on the \l QGLAbstractScene class.
 
-    In cases where the scene is composed of multiple nodes (for example, in a \i .3ds file)
+    In cases where the scene is composed of multiple nodes (for example, in a \e .3ds file)
     the mesh allows users to split away branches of the tree and manipulate them in
     isolation from the original scene graph.
 
@@ -164,9 +164,9 @@ QDeclarativeMesh::~QDeclarativeMesh()
     specified via the source property.
 
     Source files can be of any type supported by Qt3D.  The types of file currently
-    supported can be found in the \c sceneFormat plugins, with \i .3ds, \i .bez, \i. obj
+    supported can be found in the \c sceneFormat plugins, with \e .3ds, \e .bez, \e .obj
     files currently being supported.
-    
+
     Meshes can also be stored within QRC files and loaded via the standard resource
     mechanisms, however there may be issues with some esoteric remote resource loading
     requirements within the different file types.
diff --git a/src/quick3d/quick3d.pro b/src/quick3d/quick3d.pro
index fea5758e0..633ac0b5f 100644
--- a/src/quick3d/quick3d.pro
+++ b/src/quick3d/quick3d.pro
@@ -1,8 +1,8 @@
 load(qt_module)
 
 TARGET     = Qt3DQuick
-MODULE     = qt3dquick
-QT         = core gui network declarative quick qt3d
+MODULE     = 3dquick
+QT         = core gui network declarative quick 3d
 
 CONFIG += module
 MODULE_PRI = ../../modules/qt_qt3dquick.pri
diff --git a/src/threed/geometry/qglbuilder.cpp b/src/threed/geometry/qglbuilder.cpp
index a89cc6e5e..8e245540e 100644
--- a/src/threed/geometry/qglbuilder.cpp
+++ b/src/threed/geometry/qglbuilder.cpp
@@ -358,7 +358,7 @@ QT_BEGIN_NAMESPACE
     coalesced into one, and referenced by indices.
 
     One of the few exceptions to this is the case where texture data forms
-    a \i seam and a copy of a vertex must be created to carry the two
+    a \e seam and a copy of a vertex must be created to carry the two
     texture coordinates either side of the seam.
 
     \image texture-seam.png
diff --git a/src/threed/geometry/qglsection.cpp b/src/threed/geometry/qglsection.cpp
index 3b8bd0d62..14abea38f 100644
--- a/src/threed/geometry/qglsection.cpp
+++ b/src/threed/geometry/qglsection.cpp
@@ -79,7 +79,7 @@ QT_BEGIN_NAMESPACE
     indexes created to reference the fewest possible copies of the vertex
     data.  For example, in smooth geometry all copies of a vertex are
     coalesced into one, and referenced by indices - except in the case
-    where texture data forms a \i seam and a copy must be created to carry
+    where texture data forms a \e seam and a copy must be created to carry
     the two texture coordinates of the seam.
 
     This is handled automatically by QGLSection, to pack data into the
diff --git a/src/threed/scene/qglrenderorder.cpp b/src/threed/scene/qglrenderorder.cpp
index d74892bcd..d5aca7e93 100644
--- a/src/threed/scene/qglrenderorder.cpp
+++ b/src/threed/scene/qglrenderorder.cpp
@@ -75,8 +75,8 @@ QT_BEGIN_NAMESPACE
     Custom render orders may be created by sub-classing QGLRenderOrderComparator
     and reimplementing the following methods:
     \list
-        \i isEqualTo()
-        \i isLessThan()
+        \o isEqualTo()
+        \o isLessThan()
     \endlist
 
     By default all nodes which have the same effect type are rendered together,
@@ -172,7 +172,7 @@ bool QGLRenderOrder::isEqual(const QGLRenderOrder &rhs) const
         \o Standard effect - ordered by numerical value, eg QGL::FlatColor < QGL::LitMaterial
         \o User effect - ordered by pointer comparison
     \endlist
-    So a node with \c{hasEffect() == false} node is \i{less than} a node with
+    So a node with \c{hasEffect() == false} node is \e{less than} a node with
     a custom user effect, for example.
 
     \sa isEqual()
diff --git a/src/threed/threed.pro b/src/threed/threed.pro
index 277bbb8c1..e6eb3a601 100644
--- a/src/threed/threed.pro
+++ b/src/threed/threed.pro
@@ -1,7 +1,7 @@
 load(qt_module)
 
 TARGET     = Qt3D
-MODULE     = qt3d
+MODULE     = 3d
 QT         = core-private gui-private network
 
 CONFIG += module
diff --git a/tests/auto/threed/load_model/load_model.pro b/tests/auto/threed/load_model/load_model.pro
index 41f728a2c..d8441cc2d 100644
--- a/tests/auto/threed/load_model/load_model.pro
+++ b/tests/auto/threed/load_model/load_model.pro
@@ -1,7 +1,7 @@
 TARGET = tst_load_model
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 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 9834ef780..4df10826f 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 qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 SOURCES += tst_qareaallocator.cpp
diff --git a/tests/auto/threed/qarray/qarray.pro b/tests/auto/threed/qarray/qarray.pro
index 5c28c5a6a..695c766a3 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 qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 SOURCES += tst_qarray.cpp
diff --git a/tests/auto/threed/qbox3d/qbox3d.pro b/tests/auto/threed/qbox3d/qbox3d.pro
index b488bd2a2..3f19d0c57 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 qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 SOURCES += tst_qbox3d.cpp
diff --git a/tests/auto/threed/qcolor4ub/qcolor4ub.pro b/tests/auto/threed/qcolor4ub/qcolor4ub.pro
index 64c1166d1..bfaad944b 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 qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 SOURCES += tst_qcolor4ub.cpp
diff --git a/tests/auto/threed/qcustomdataarray/qcustomdataarray.pro b/tests/auto/threed/qcustomdataarray/qcustomdataarray.pro
index e6cf6d241..d3168335d 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 qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 SOURCES += tst_qcustomdataarray.cpp
diff --git a/tests/auto/threed/qgeometrydata/qgeometrydata.pro b/tests/auto/threed/qgeometrydata/qgeometrydata.pro
index 20526f1d8..4ebc94edf 100644
--- a/tests/auto/threed/qgeometrydata/qgeometrydata.pro
+++ b/tests/auto/threed/qgeometrydata/qgeometrydata.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qgeometrydata
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 INCLUDEPATH += ../../../shared
diff --git a/tests/auto/threed/qglabstractsurface/qglabstractsurface.pro b/tests/auto/threed/qglabstractsurface/qglabstractsurface.pro
index 907752d62..53788bc48 100644
--- a/tests/auto/threed/qglabstractsurface/qglabstractsurface.pro
+++ b/tests/auto/threed/qglabstractsurface/qglabstractsurface.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglabstractsurface
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 SOURCES += tst_qglabstractsurface.cpp
diff --git a/tests/auto/threed/qglattributedescription/qglattributedescription.pro b/tests/auto/threed/qglattributedescription/qglattributedescription.pro
index 17071c6f8..e87d773a6 100644
--- a/tests/auto/threed/qglattributedescription/qglattributedescription.pro
+++ b/tests/auto/threed/qglattributedescription/qglattributedescription.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglattributedescription
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 INCLUDEPATH += ../../../../threed/viewing
diff --git a/tests/auto/threed/qglattributeset/qglattributeset.pro b/tests/auto/threed/qglattributeset/qglattributeset.pro
index fc80c846a..ee7df94cd 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 qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 SOURCES += tst_qglattributeset.cpp
diff --git a/tests/auto/threed/qglattributevalue/qglattributevalue.pro b/tests/auto/threed/qglattributevalue/qglattributevalue.pro
index 055457e7d..33307db61 100644
--- a/tests/auto/threed/qglattributevalue/qglattributevalue.pro
+++ b/tests/auto/threed/qglattributevalue/qglattributevalue.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglattributevalue
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 INCLUDEPATH += ../../../../threed/viewing
diff --git a/tests/auto/threed/qglbezierpatches/qglbezierpatches.pro b/tests/auto/threed/qglbezierpatches/qglbezierpatches.pro
index 282259f59..227264628 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 qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 SOURCES += tst_qglbezierpatches.cpp
diff --git a/tests/auto/threed/qglbuilder/qglbuilder.pro b/tests/auto/threed/qglbuilder/qglbuilder.pro
index 07a078982..c7b2ed7eb 100644
--- a/tests/auto/threed/qglbuilder/qglbuilder.pro
+++ b/tests/auto/threed/qglbuilder/qglbuilder.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglbuilder
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 INCLUDEPATH += ../../../shared
diff --git a/tests/auto/threed/qglcamera/qglcamera.pro b/tests/auto/threed/qglcamera/qglcamera.pro
index 89ccf5b0a..c1703b296 100644
--- a/tests/auto/threed/qglcamera/qglcamera.pro
+++ b/tests/auto/threed/qglcamera/qglcamera.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglcamera
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 INCLUDEPATH += ../../../../threed/viewing
diff --git a/tests/auto/threed/qglcameraanimation/qglcameraanimation.pro b/tests/auto/threed/qglcameraanimation/qglcameraanimation.pro
index 9e21a9128..6eea0adbd 100644
--- a/tests/auto/threed/qglcameraanimation/qglcameraanimation.pro
+++ b/tests/auto/threed/qglcameraanimation/qglcameraanimation.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglcameraanimation
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 INCLUDEPATH += ../../../../threed/viewing
diff --git a/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro b/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro
index 0ed7bc2ea..e8afc8322 100644
--- a/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro
+++ b/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglcolladafxeffectfactory
 CONFIG += testcase
 TEMPLATE = app
-QT += testlib qt3d
+QT += testlib 3d
 
 CONFIG += warn_on
 
diff --git a/tests/auto/threed/qglcube/qglcube.pro b/tests/auto/threed/qglcube/qglcube.pro
index 7adc2f249..810b65629 100644
--- a/tests/auto/threed/qglcube/qglcube.pro
+++ b/tests/auto/threed/qglcube/qglcube.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglcube
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 INCLUDEPATH += ../../../shared
diff --git a/tests/auto/threed/qglcylinder/qglcylinder.pro b/tests/auto/threed/qglcylinder/qglcylinder.pro
index fdfca9e04..37f128a05 100644
--- a/tests/auto/threed/qglcylinder/qglcylinder.pro
+++ b/tests/auto/threed/qglcylinder/qglcylinder.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglcylinder
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 INCLUDEPATH += ../../../shared
diff --git a/tests/auto/threed/qglindexbuffer/qglindexbuffer.pro b/tests/auto/threed/qglindexbuffer/qglindexbuffer.pro
index 3b3b15714..151ff0ba1 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 qt3d opengl
+QT += testlib 3d opengl
 CONFIG += warn_on
 
 SOURCES += tst_qglindexbuffer.cpp
diff --git a/tests/auto/threed/qgllightmodel/qgllightmodel.pro b/tests/auto/threed/qgllightmodel/qgllightmodel.pro
index 589f10595..367255b16 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 qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 SOURCES += tst_qgllightmodel.cpp
diff --git a/tests/auto/threed/qgllightparameters/qgllightparameters.pro b/tests/auto/threed/qgllightparameters/qgllightparameters.pro
index 9c8fea5d9..40222cf8a 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 qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 SOURCES += tst_qgllightparameters.cpp
diff --git a/tests/auto/threed/qglmaterial/qglmaterial.pro b/tests/auto/threed/qglmaterial/qglmaterial.pro
index 21da957f0..681c1adef 100644
--- a/tests/auto/threed/qglmaterial/qglmaterial.pro
+++ b/tests/auto/threed/qglmaterial/qglmaterial.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglmaterial
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 SOURCES += tst_qglmaterial.cpp
diff --git a/tests/auto/threed/qglmaterialcollection/qglmaterialcollection.pro b/tests/auto/threed/qglmaterialcollection/qglmaterialcollection.pro
index 98843570a..c88798827 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 qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 SOURCES += tst_qglmaterialcollection.cpp
diff --git a/tests/auto/threed/qglpainter/qglpainter.pro b/tests/auto/threed/qglpainter/qglpainter.pro
index ec69275dc..235ce3ac6 100644
--- a/tests/auto/threed/qglpainter/qglpainter.pro
+++ b/tests/auto/threed/qglpainter/qglpainter.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglpainter
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 INCLUDEPATH += ../../../shared
diff --git a/tests/auto/threed/qglrender/qglrender.pro b/tests/auto/threed/qglrender/qglrender.pro
index dfc3a95a4..0facb242b 100644
--- a/tests/auto/threed/qglrender/qglrender.pro
+++ b/tests/auto/threed/qglrender/qglrender.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglrender
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 SOURCES += tst_qglrender.cpp
diff --git a/tests/auto/threed/qglscenenode/qglscenenode.pro b/tests/auto/threed/qglscenenode/qglscenenode.pro
index d351fe5bc..57cae15c9 100644
--- a/tests/auto/threed/qglscenenode/qglscenenode.pro
+++ b/tests/auto/threed/qglscenenode/qglscenenode.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglscenenode
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 INCLUDEPATH += ../../../shared
diff --git a/tests/auto/threed/qglsection/qglsection.pro b/tests/auto/threed/qglsection/qglsection.pro
index 7a64d983b..b8564628e 100644
--- a/tests/auto/threed/qglsection/qglsection.pro
+++ b/tests/auto/threed/qglsection/qglsection.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglsection
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 INCLUDEPATH += ../../../shared
diff --git a/tests/auto/threed/qglsphere/qglsphere.pro b/tests/auto/threed/qglsphere/qglsphere.pro
index 71942cb3c..41fad7e86 100644
--- a/tests/auto/threed/qglsphere/qglsphere.pro
+++ b/tests/auto/threed/qglsphere/qglsphere.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglsphere
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 INCLUDEPATH += ../../../shared
diff --git a/tests/auto/threed/qglvertexbundle/qglvertexbundle.pro b/tests/auto/threed/qglvertexbundle/qglvertexbundle.pro
index ebc174009..a789f4b49 100644
--- a/tests/auto/threed/qglvertexbundle/qglvertexbundle.pro
+++ b/tests/auto/threed/qglvertexbundle/qglvertexbundle.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglvertexbundle
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d opengl
+QT += testlib 3d opengl
 CONFIG += warn_on
 
 SOURCES += tst_qglvertexbundle.cpp
diff --git a/tests/auto/threed/qgraphicstransform3d/qgraphicstransform3d.pro b/tests/auto/threed/qgraphicstransform3d/qgraphicstransform3d.pro
index 0d4293971..7fb934a9a 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 qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 SOURCES += tst_qgraphicstransform3d.cpp
diff --git a/tests/auto/threed/qplane3d/qplane3d.pro b/tests/auto/threed/qplane3d/qplane3d.pro
index c8dbfb1bd..39513a960 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 qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 SOURCES += tst_qplane3d.cpp
diff --git a/tests/auto/threed/qray3d/qray3d.pro b/tests/auto/threed/qray3d/qray3d.pro
index 1dc89415e..058fc46c3 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 qt3d
+QT += testlib 3d
 CONFIG += warn_on
 SOURCES += tst_qray3d.cpp
diff --git a/tests/auto/threed/qsphere3d/qsphere3d.pro b/tests/auto/threed/qsphere3d/qsphere3d.pro
index e35abbdb7..b4e39b4ab 100644
--- a/tests/auto/threed/qsphere3d/qsphere3d.pro
+++ b/tests/auto/threed/qsphere3d/qsphere3d.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qsphere3d
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 CONFIG += warn_on
 SOURCES += tst_qsphere3d.cpp
diff --git a/tests/auto/threed/qtriangle3d/qtriangle3d.pro b/tests/auto/threed/qtriangle3d/qtriangle3d.pro
index 31bfc104b..a14a79196 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 qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 SOURCES += tst_qtriangle3d.cpp
diff --git a/tests/auto/threed/qvectorarray/qvectorarray.pro b/tests/auto/threed/qvectorarray/qvectorarray.pro
index 485e09f2c..3a3e8da32 100644
--- a/tests/auto/threed/qvectorarray/qvectorarray.pro
+++ b/tests/auto/threed/qvectorarray/qvectorarray.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qvectorarray
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 
 CONFIG += warn_on
 
diff --git a/tests/benchmarks/qarray/qarray.pro b/tests/benchmarks/qarray/qarray.pro
index d83241b99..8fccb040b 100644
--- a/tests/benchmarks/qarray/qarray.pro
+++ b/tests/benchmarks/qarray/qarray.pro
@@ -1,5 +1,5 @@
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib 3d
 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 e3aa14855..54c0610c9 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 qt3d
+QT += testlib 3d
 CONFIG += warn_on
 
 SOURCES += tst_qglbuilder_perf.cpp
-INCLUDEPATH += $$QT.qt3d.sources/geometry
+INCLUDEPATH += $$QT.3d.sources/geometry
diff --git a/tests/manual/animations/animations.pro b/tests/manual/animations/animations.pro
index f1393d1e5..de199280b 100644
--- a/tests/manual/animations/animations.pro
+++ b/tests/manual/animations/animations.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = tst_animations
 CONFIG += qt warn_on
 
-QT += qt3d quick
+QT += 3d quick
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/displaymodel/displaymodel.pro b/tests/manual/displaymodel/displaymodel.pro
index 3cdd029e3..7b8af235a 100644
--- a/tests/manual/displaymodel/displaymodel.pro
+++ b/tests/manual/displaymodel/displaymodel.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = tst_displaymodel
 CONFIG += qt warn_on
 
-QT += qt3d quick
+QT += 3d quick
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/model3ds/model3ds.pro b/tests/manual/model3ds/model3ds.pro
index 8721115a3..718dc1059 100644
--- a/tests/manual/model3ds/model3ds.pro
+++ b/tests/manual/model3ds/model3ds.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = tst_model3ds
 CONFIG += qt warn_on
 
-QT += qt3d quick
+QT += 3d quick
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/navigation1/navigation1.pro b/tests/manual/navigation1/navigation1.pro
index dfda637e4..764f10b87 100644
--- a/tests/manual/navigation1/navigation1.pro
+++ b/tests/manual/navigation1/navigation1.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = tst_navigation1
 CONFIG += qt warn_on
 
-QT += qt3d quick
+QT += 3d quick
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/qrc/qrc.pro b/tests/manual/qrc/qrc.pro
index 1c25871dd..ead2314d2 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
 
-QT += qt3d quick
+QT += 3d quick
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/rotation/rotation.pro b/tests/manual/rotation/rotation.pro
index 06ef8bb10..ff99883ca 100644
--- a/tests/manual/rotation/rotation.pro
+++ b/tests/manual/rotation/rotation.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = tst_rotation
 CONFIG += qt warn_on
 
-QT += qt3d quick
+QT += 3d quick
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/scaling/scaling.pro b/tests/manual/scaling/scaling.pro
index ef7b0c357..2fd9302f2 100644
--- a/tests/manual/scaling/scaling.pro
+++ b/tests/manual/scaling/scaling.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = tst_scaling
 CONFIG += qt warn_on
 
-QT += qt3d quick
+QT += 3d quick
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/shapes/shapes.pro b/tests/manual/shapes/shapes.pro
index cc0e37ec5..2e1cc6371 100644
--- a/tests/manual/shapes/shapes.pro
+++ b/tests/manual/shapes/shapes.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = tst_shapes
 CONFIG += qt warn_on
 
-QT += qt3d quick
+QT += 3d quick
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/submesh/submesh.pro b/tests/manual/submesh/submesh.pro
index ed68ccf3a..56f21eb17 100644
--- a/tests/manual/submesh/submesh.pro
+++ b/tests/manual/submesh/submesh.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = tst_submesh
 CONFIG += qt warn_on
 
-QT += qt3d quick
+QT += 3d quick
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/transformations/transformations.pro b/tests/manual/transformations/transformations.pro
index 34f47b3cf..c04370b5c 100644
--- a/tests/manual/transformations/transformations.pro
+++ b/tests/manual/transformations/transformations.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = tst_transformations
 CONFIG += qt warn_on
 
-QT += qt3d quick
+QT += 3d quick
 
 SOURCES += main.cpp
 
diff --git a/tests/manual/translation/translation.pro b/tests/manual/translation/translation.pro
index a4a3d3ccc..aa2aeb597 100644
--- a/tests/manual/translation/translation.pro
+++ b/tests/manual/translation/translation.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = tst_translation
 CONFIG += qt warn_on
 
-QT += qt3d quick
+QT += 3d quick
 
 SOURCES += main.cpp
 
diff --git a/tutorials/qt3d/cube1/cube1.pro b/tutorials/qt3d/cube1/cube1.pro
index e8250212f..46c44bba1 100644
--- a/tutorials/qt3d/cube1/cube1.pro
+++ b/tutorials/qt3d/cube1/cube1.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = cube1
 CONFIG += qt warn_on
-QT += qt3d
+QT += 3d
 SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
diff --git a/tutorials/qt3d/cube2/cube2.pro b/tutorials/qt3d/cube2/cube2.pro
index f2399fd3c..855117f33 100644
--- a/tutorials/qt3d/cube2/cube2.pro
+++ b/tutorials/qt3d/cube2/cube2.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = cube2
 CONFIG += qt warn_on
-QT += qt3d
+QT += 3d
 SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
diff --git a/tutorials/qt3d/cube3/cube3.pro b/tutorials/qt3d/cube3/cube3.pro
index b3cd1fc78..0dadf9673 100644
--- a/tutorials/qt3d/cube3/cube3.pro
+++ b/tutorials/qt3d/cube3/cube3.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = cube3
 CONFIG += qt warn_on
-QT += qt3d
+QT += 3d
 SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
diff --git a/tutorials/qt3d/cube4/cube4.pro b/tutorials/qt3d/cube4/cube4.pro
index c98150d5f..24381eee0 100644
--- a/tutorials/qt3d/cube4/cube4.pro
+++ b/tutorials/qt3d/cube4/cube4.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = cube4
 CONFIG += qt warn_on
-QT += qt3d
+QT += 3d
 SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
 RESOURCES = cube.qrc
diff --git a/tutorials/qt3d/penguin/penguin.pro b/tutorials/qt3d/penguin/penguin.pro
index 59461dc6d..7274755ba 100644
--- a/tutorials/qt3d/penguin/penguin.pro
+++ b/tutorials/qt3d/penguin/penguin.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = penguin
 CONFIG += qt warn_on
-QT += qt3d
+QT += 3d
 SOURCES = modelview.cpp \
     main.cpp
 HEADERS = modelview.h
diff --git a/tutorials/qt3d/penguin_advanced/penguin_advanced.pro b/tutorials/qt3d/penguin_advanced/penguin_advanced.pro
index 3e70a5fc6..d1ae29878 100644
--- a/tutorials/qt3d/penguin_advanced/penguin_advanced.pro
+++ b/tutorials/qt3d/penguin_advanced/penguin_advanced.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = penguin_advanced
 CONFIG += qt warn_on
-QT += qt3d
+QT += 3d
 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 0c69061cf..81ac9af98 100644
--- a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro
+++ b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = teapot_bounce_qml
 CONFIG += qt warn_on
 
-QT += qt3d quick
+QT += 3d quick
 
 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 022d075ba..018dd6d7f 100644
--- a/tutorials/quick3d/teapot_qml/teapot_qml.pro
+++ b/tutorials/quick3d/teapot_qml/teapot_qml.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = teapot_qml
 CONFIG += qt warn_on
 
-QT += qt3d quick
+QT += 3d quick
 
 SOURCES += main.cpp
 HEADERS += ../qmlres.h
diff --git a/util/meshcvt/meshcvt.pro b/util/meshcvt/meshcvt.pro
index 6feb982a6..5df99ce3f 100644
--- a/util/meshcvt/meshcvt.pro
+++ b/util/meshcvt/meshcvt.pro
@@ -1,6 +1,6 @@
 TARGET = meshcvt
 
-QT += qt3d
+QT += 3d
 
 SOURCES += \
     meshcvt.cpp \
diff --git a/util/qt3d/qglinfo/qglinfo.pro b/util/qt3d/qglinfo/qglinfo.pro
index f8e5d9a18..7a01f22e2 100644
--- a/util/qt3d/qglinfo/qglinfo.pro
+++ b/util/qt3d/qglinfo/qglinfo.pro
@@ -1,5 +1,5 @@
 TARGET = qglinfo
-QT += qt3d
+QT += 3d
 
 SOURCES += main.cpp \
     qglinfowindow.cpp \
@@ -22,6 +22,6 @@ OTHER_FILES += \
 
 RC_FILE = qglinfo.rc
 
-DESTDIR = $$QT.qt3d.bins
+DESTDIR = $$QT.3d.bins
 target.path = $$[QT_INSTALL_BINS]
 INSTALLS += target