QtQuick3d: Compile on Windows.

- Fix missing library specifications
- Fix g++ string conversion warnings.

Change-Id: I48f19ac0f33bea1154c31c9aeab1bbd83f8f3d84
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>

36 files changed, 80 insertions, 70 deletions

diff --git a/demos/qt3d/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro
index 6a257091c..46eda3d2d 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 += widgets qt3d
 
 CONFIG += qt3d_deploy_pkg
 include(../../../pkg.pri)
diff --git a/demos/qt3d/pageflip/pageflip.cpp b/demos/qt3d/pageflip/pageflip.cpp
index 904277cb2..f49d5f2e7 100644
--- a/demos/qt3d/pageflip/pageflip.cpp
+++ b/demos/qt3d/pageflip/pageflip.cpp
@@ -46,6 +46,7 @@
 #include "qglabstracteffect.h"
 #include "qgltexture2d.h"
 #include "qglshaderprogrameffect.h"
+#include <QtGui/QOpenGLContext>
 #include <QtOpenGL/qglshaderprogram.h>
 #include "pageflipmath_p.h"
 
diff --git a/demos/qt3d/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro
index de95caaa6..9a49941dc 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 += widgets 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 40427ed08..37c7275f7 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3d.pro
+++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro
@@ -1,6 +1,7 @@
 TEMPLATE = app
 TARGET = photobrowser3d
 CONFIG += qt warn_on
+QT += widgets
 
 include(../../../pkg.pri)
 QT += qt3d opengl
diff --git a/demos/qt3d/shapes/shapes.pro b/demos/qt3d/shapes/shapes.pro
index 32a774fa8..bebc7157a 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 += widgets qt3d
 
 SOURCES = shapes.cpp
 
diff --git a/demos/qt3d/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro
index 0841e3179..650fe030e 100644
--- a/demos/qt3d/teaservice/teaservice.pro
+++ b/demos/qt3d/teaservice/teaservice.pro
@@ -1,6 +1,7 @@
 TEMPLATE = app
 TARGET = teaservice
 CONFIG += qt warn_on
+QT += widgets
 
 include(../../../pkg.pri)
 QT += qt3d
diff --git a/demos/quick3d/flickr3d/flickr3d.rc b/demos/quick3d/flickr3d/flickr3d.rc
index 1b6228c97..7650294b3 100644
--- a/demos/quick3d/flickr3d/flickr3d.rc
+++ b/demos/quick3d/flickr3d/flickr3d.rc
@@ -1 +1 @@
-IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
+IDI_ICON1               ICON    DISCARDABLE     "..\\model_viewer\\qtquick3d.ico"
diff --git a/demos/quick3d/model_viewer/model_viewer.pro b/demos/quick3d/model_viewer/model_viewer.pro
index 7d97adbcb..57b2590cd 100644
--- a/demos/quick3d/model_viewer/model_viewer.pro
+++ b/demos/quick3d/model_viewer/model_viewer.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = model_viewer
-QT += declarative
+QT += declarative widgets
 CONFIG += qt warn_on
 
 SOURCES += main.cpp
diff --git a/demos/quick3d/tea_service/tea_service.pro b/demos/quick3d/tea_service/tea_service.pro
index a33a08bfd..a03cb63ed 100644
--- a/demos/quick3d/tea_service/tea_service.pro
+++ b/demos/quick3d/tea_service/tea_service.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = tea_service
-QT += declarative
+QT += declarative widgets
 CONFIG += qt warn_on
 
 SOURCES += main.cpp
diff --git a/examples/qt3d/builder/builder.pro b/examples/qt3d/builder/builder.pro
index 5048fae4c..f16480aea 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 += widgets qt3d
 
 SOURCES = builder.cpp \
     main.cpp
diff --git a/examples/qt3d/cube/cube.pro b/examples/qt3d/cube/cube.pro
index a853d4eee..5a80109d3 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 += widgets qt3d
 
 SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
diff --git a/examples/qt3d/cylinder/cylinder.pro b/examples/qt3d/cylinder/cylinder.pro
index 0d29cf8ac..b557ae878 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 += widgets qt3d
 
 SOURCES = cylinderview.cpp main.cpp
 HEADERS = cylinderview.h
diff --git a/examples/qt3d/geometry/geometry.pro b/examples/qt3d/geometry/geometry.pro
index 54da9d4ac..401baeec9 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 += widgets qt3d
 
 SOURCES = geometryview.cpp \
     main.cpp \
diff --git a/examples/qt3d/graphicsview/graphicsview.pro b/examples/qt3d/graphicsview/graphicsview.pro
index b6da55ea5..452e9fdde 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
-QT += qt3d
+QT += widgets qt3d
 
 VPATH += $$PWD/../../src/threed/geometry
 SOURCES = \
diff --git a/examples/qt3d/nesting/nesting.pro b/examples/qt3d/nesting/nesting.pro
index 727503153..1fdae9a49 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 += widgets qt3d
 
 SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
diff --git a/examples/qt3d/solarsystem/solarsystem.pro b/examples/qt3d/solarsystem/solarsystem.pro
index a55e5e33e..e14b3fe43 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 += widgets qt3d
 
 SOURCES = solarsystem.cpp \
     main.cpp
diff --git a/examples/qt3d/tank/tank.pro b/examples/qt3d/tank/tank.pro
index 9092ab586..a7d639c67 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 += widgets qt3d
 
 SOURCES += main.cpp\
     tankview.cpp \
diff --git a/examples/qt3d/teapot/teapot.pro b/examples/qt3d/teapot/teapot.pro
index 16ab7b4e1..f8930978f 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 += widgets qt3d
 
 SOURCES = teapotview.cpp main.cpp
 HEADERS = teapotview.h
diff --git a/src/imports/shapes/shapes.pro b/src/imports/shapes/shapes.pro
index dea2e0251..26d8ca291 100644
--- a/src/imports/shapes/shapes.pro
+++ b/src/imports/shapes/shapes.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
 TARGET  = qshapesqmlplugin
 CONFIG += qt plugin
 
-QT += qt3d quick3d
+QT += declarative qt3d quick3d
 
 DESTDIR = $$QT.quick3d.imports/Qt3D/Shapes
 target.path = $$[QT_INSTALL_IMPORTS]/Qt3D/Shapes
diff --git a/src/imports/threed/threed.pro b/src/imports/threed/threed.pro
index 990f75b45..9151b7a09 100644
--- a/src/imports/threed/threed.pro
+++ b/src/imports/threed/threed.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
 TARGET  = qthreedqmlplugin
 CONFIG += qt plugin
 
-QT += qt3d quick3d
+QT += widgets opengl declarative qt3d quick3d
 
 DESTDIR = $$QT.quick3d.imports/Qt3D
 target.path = $$[QT_INSTALL_IMPORTS]/Qt3D
diff --git a/src/quick3d/qdeclarativeeffect.cpp b/src/quick3d/qdeclarativeeffect.cpp
index 01c1cfa3a..c796cc226 100644
--- a/src/quick3d/qdeclarativeeffect.cpp
+++ b/src/quick3d/qdeclarativeeffect.cpp
@@ -49,7 +49,7 @@
 
 #include <QtDeclarative/qdeclarativeengine.h>
 
-#include <qdeclarativeinfo.h>
+#include <QtDeclarative/qdeclarativeinfo.h>
 #include "qglscenenode.h"
 
 /*!
diff --git a/src/quick3d/qdeclarativemesh.cpp b/src/quick3d/qdeclarativemesh.cpp
index 8ba3d01d3..294ccbcad 100644
--- a/src/quick3d/qdeclarativemesh.cpp
+++ b/src/quick3d/qdeclarativemesh.cpp
@@ -190,9 +190,9 @@ void QDeclarativeMesh::setSource(const QUrl& value)
         setScene(s);
     } else if (d->data.scheme().toLower() == QLatin1String("qrc")) {
         // strips off any qrc: prefix and any excess slashes and replaces it with :/
-        d->data.setScheme("");
+        d->data.setScheme(QString());
         QGLAbstractScene *s = QGLAbstractScene::loadScene(
-                    QLatin1String(":")+d->data.toString(),
+                    QLatin1Char(':')+d->data.toString(),
                     QString(), d->options);
         setScene(s);
     } else
diff --git a/src/threed/effects/qglcolladafxeffectfactory.cpp b/src/threed/effects/qglcolladafxeffectfactory.cpp
index 89183f816..8b10d685b 100644
--- a/src/threed/effects/qglcolladafxeffectfactory.cpp
+++ b/src/threed/effects/qglcolladafxeffectfactory.cpp
@@ -71,11 +71,11 @@ static int QGLColladaIndentLevel = 0;
 class Indent
 {
 public:
-    static int currentIndent() { return QGLColladaIndentLevel; };
+    static int currentIndent() { return QGLColladaIndentLevel; }
     Indent()
     {
         ++QGLColladaIndentLevel;
-    };
+    }
     ~Indent()
     {
         --QGLColladaIndentLevel;
@@ -173,23 +173,23 @@ QString QGLColladaFxEffectFactory::exportEffect(QGLColladaFxEffect *effect, QStr
 
     {
         Indent indent;
-        result += indent + QLatin1String("<asset>");
+        result += indent + QString(QStringLiteral("<asset>"));
         {
             Indent indent;
             QDateTime time = QDateTime::currentDateTime();
-            result += indent + QLatin1String("<created>") + time.toString(Qt::ISODate) + QLatin1String("</created>");
-            result += indent + QLatin1String("<modified>") + time.toString(Qt::ISODate) + QLatin1String("</modified>");
+            result += indent + QString(QStringLiteral("<created>")) + time.toString(Qt::ISODate) + QLatin1String("</created>");
+            result += indent + QString(QStringLiteral("<modified>")) + time.toString(Qt::ISODate) + QLatin1String("</modified>");
         }
-        result += indent + QLatin1String("</asset>");
+        result += indent + QString(QStringLiteral("</asset>"));
 
-        result += indent + QLatin1String("<library_effects>");
+        result += indent + QString(QStringLiteral("<library_effects>"));
         {
             Indent indent;
-            result += indent + QLatin1String("<effect id=\"") + effectId + QLatin1String("\">");
+            result += indent + QString(QStringLiteral("<effect id=\"")) + effectId + QLatin1String("\">");
             result += glslProfileFromEffect(effect, techniqueSid);
-            result += indent + QLatin1String("</effect>");
+            result += indent + QString(QStringLiteral("</effect>"));
         }
-        result += indent + QLatin1String("</library_effects>");
+        result += indent + QString(QStringLiteral("</library_effects>"));
         result += QLatin1String("</COLLADA>");
         return result.join(QLatin1String("\n"));
     }
@@ -1425,19 +1425,19 @@ QStringList QGLColladaFxEffectFactory::glslProfileFromEffect(QGLColladaFxEffect*
     Q_UNUSED(effect)
     Indent indent;
     QStringList result;
-    result += indent + QLatin1String("<profile_GLSL>");
+    result += indent + QString(QStringLiteral("<profile_GLSL>"));
     {
         result += generateCodeElements(effect, sid);
-        result += indent + QLatin1String("<technique sid=\"") + sid + QLatin1String("\">");
+        result += indent + QString(QStringLiteral("<technique sid=\"")) + sid + QLatin1String("\">");
         {
             Indent indent;
-            result += indent + QLatin1String("<pass>");
+            result += indent + QString(QStringLiteral("<pass>"));
             result += generateProgramElement(effect, sid);
-            result += indent + QLatin1String("</pass>");
+            result += indent + QString(QStringLiteral("</pass>"));
         }
-        result += indent + QLatin1String("</technique>");
+        result += indent + QString(QStringLiteral("</technique>"));
     }
-    result += indent + QLatin1String("</profile_GLSL>");
+    result += indent + QString(QStringLiteral("</profile_GLSL>"));
 
     return result;
 }
@@ -1448,13 +1448,13 @@ QStringList QGLColladaFxEffectFactory::generateProgramElement(QGLColladaFxEffect
     QString vertexShaderRefSid = QLatin1String("VertexShaderRefSidRefsCodeOrIncludeAtProfileOrEffectLevel");
     QString fragmentShaderRefSid = QLatin1String("FragmentShaderRefSidRefsCodeOrIncludeAtProfileOrEffectLevel");
     Indent indent;
-    result += indent + QLatin1String("<program>");
+    result += indent + QString(QStringLiteral("<program>"));
     result += generateShaderElement(effect, techniqueSid + QLatin1String("VertexShader"), techniqueSid + QLatin1String("FragmentShader"));
     // 0 or more
     result += generateBindAttributeElement( effect );
     // 0 or more
     result += generateBindUniformElements( effect );
-    result += indent + QLatin1String("</program>");
+    result += indent + QString(QStringLiteral("</program>"));
     return result;
 }
 
@@ -1463,32 +1463,32 @@ QStringList QGLColladaFxEffectFactory::generateShaderElement( QGLColladaFxEffect
     Q_UNUSED(effect);
     QStringList result;
     Indent indent;
-    result += indent + QLatin1String("<shader stage=\"VERTEX\">");
+    result += indent + QString(QStringLiteral("<shader stage=\"VERTEX\">"));
     {
         Indent indent;
-        result += indent + QLatin1String("<sources>");
+        result += indent + QString(QStringLiteral("<sources>"));
         {
             // 0 or more <import> elements
             Indent indent;
-            result += indent + QLatin1String("<import ref=\"") + vertexShaderRefSid + QLatin1String("\"/>");
+            result += indent + QString(QStringLiteral("<import ref=\"")) + vertexShaderRefSid + QLatin1String("\"/>");
         }
-        result += indent + QLatin1String("</sources>");
+        result += indent + QString(QStringLiteral("</sources>"));
         // 0 or <extra> elements;
     }
-    result += indent + QLatin1String("</shader>");
+    result += indent + QString(QStringLiteral("</shader>"));
 
-    result += indent + QLatin1String("<shader stage=\"FRAGMENT\">");
+    result += indent + QString(QStringLiteral("<shader stage=\"FRAGMENT\">"));
     {
         Indent indent;
-        result += indent + QLatin1String("<sources>");
+        result += indent + QString(QStringLiteral("<sources>"));
         {
             Indent indent;
-            result += indent + QLatin1String("<import ref=\"") + fragmentShaderRefSid + QLatin1String("\"/>");
+            result += indent + QString(QStringLiteral("<import ref=\"")) + fragmentShaderRefSid + QLatin1String("\"/>");
         }
-        result += indent + QLatin1String("</sources>");
+        result += indent + QString(QStringLiteral("</sources>"));
         // <extra> element(s) here if necessary;
     }
-    result += indent + QLatin1String("</shader>");
+    result += indent + QString(QStringLiteral("</shader>"));
     return result;
 }
 
@@ -1508,12 +1508,12 @@ QStringList generateBindUniformParamElement( QString symbol, QString ref)
     QStringList result;
     // 0 or more <bind_uniform> elements
     Indent indent;
-    result += indent + QLatin1String("<bind_uniform symbol=\"") + symbol + QLatin1String("\">");
+    result += indent + QString(QStringLiteral("<bind_uniform symbol=\"")) + symbol + QLatin1String("\">");
     {
         Indent indent;
-        result += indent + QLatin1String("<param ref=\"") + ref + QLatin1String("\">");
+        result += indent + QString(QStringLiteral("<param ref=\"")) + ref + QLatin1String("\">");
     }
-    result += indent + QLatin1String("</bind_uniform>");
+    result += indent + QString(QStringLiteral("</bind_uniform>"));
     return result;
 }
 
@@ -1522,12 +1522,12 @@ QStringList generateBindUniformParamElement( QString symbol, const QVector3D& va
     QStringList result;
     // 0 or more <bind_uniform> elements
     Indent indent;
-    result += indent + QLatin1String("<bind_uniform symbol=\"") + symbol + QLatin1String("\">");
+    result += indent + QString(QStringLiteral("<bind_uniform symbol=\"")) + symbol + QLatin1String("\">");
     {
         Indent indent;
         result += indent + QString(QLatin1String("<float3> %1 %2 %3 </float3>")).arg(value.x()).arg(value.y()).arg(value.z());
     }
-    result += indent + QLatin1String("</bind_uniform>");
+    result += indent + QString(QStringLiteral("</bind_uniform>"));
     return result;
 }
 
@@ -1536,12 +1536,12 @@ QStringList generateBindUniformParamElement( QString symbol, const QColor& value
     QStringList result;
     // 0 or more <bind_uniform> elements
     Indent indent;
-    result += indent + QLatin1String("<bind_uniform symbol=\"") + symbol + QLatin1String("\">");
+    result += indent + QString(QStringLiteral("<bind_uniform symbol=\"")) + symbol + QLatin1String("\">");
     {
         Indent indent;
         result += indent + QString(QLatin1String("<float3> %1 %2 %3 </float3>")).arg(value.redF()).arg(value.greenF()).arg(value.blueF());
     }
-    result += indent + QLatin1String("</bind_uniform>");
+    result += indent + QString(QStringLiteral("</bind_uniform>"));
     return result;
 }
 
@@ -1587,13 +1587,13 @@ QStringList QGLColladaFxEffectFactory::generateCodeElements( QGLColladaFxEffect*
     {
         QStringList parts;
         parts << indent << QLatin1String("<code sid=\"") << baseSid << QLatin1String("VertexShader\">")
-              << effect->vertexShader() << QLatin1String("</code>");
+              << QString::fromAscii(effect->vertexShader()) << QLatin1String("</code>");
         result << parts.join(QLatin1String(""));
     }
     {
         QStringList parts;
         parts << indent << QLatin1String("<code sid=\"") << baseSid << QLatin1String("FragmentShader\">")
-              << effect->fragmentShader() << QLatin1String("</code>\n");
+              << QString::fromAscii(effect->fragmentShader()) << QLatin1String("</code>\n");
         result << parts.join(QLatin1String(""));
     }
     return result;
diff --git a/src/threed/geometry/qglcylinder.cpp b/src/threed/geometry/qglcylinder.cpp
index f2724f5cb..34c2c7ab0 100644
--- a/src/threed/geometry/qglcylinder.cpp
+++ b/src/threed/geometry/qglcylinder.cpp
@@ -324,7 +324,7 @@ QGLBuilder& operator<<(QGLBuilder& builder, const QGLCylinder& cylinder)
             //Draw end-cap at top
             QGeometryData top;
             builder.newSection();
-            builder.currentNode()->setObjectName("Cylinder Top");
+            builder.currentNode()->setObjectName(QStringLiteral("Cylinder Top"));
             top.appendVertex(newLayer.center());
             top.appendVertexArray(newLayer.vertices());
             //Generate a circle of texture vertices for this layer.
@@ -346,7 +346,7 @@ QGLBuilder& operator<<(QGLBuilder& builder, const QGLCylinder& cylinder)
             //If it's the first section, create a cylinder sides section
             if (layerCount==1) {
                 builder.newSection();
-                builder.currentNode()->setObjectName("Cylinder Sides");
+                builder.currentNode()->setObjectName(QStringLiteral("Cylinder Sides"));
             }
             builder.addQuadsInterleaved(oldLayer, newLayer);
         }
@@ -356,7 +356,7 @@ QGLBuilder& operator<<(QGLBuilder& builder, const QGLCylinder& cylinder)
             //Draw end-cap at bottom
             QGeometryData base;
             builder.newSection();
-            builder.currentNode()->setObjectName("Cylinder Base");
+            builder.currentNode()->setObjectName(QStringLiteral("Cylinder Base"));
             base.appendVertexArray(newLayer.vertices());
             base.appendVertex(newLayer.center());
             //Generate a circle of texture vertices for this layer.
diff --git a/src/threed/geometry/qgldome.cpp b/src/threed/geometry/qgldome.cpp
index f42d32846..949ccaa9c 100644
--- a/src/threed/geometry/qgldome.cpp
+++ b/src/threed/geometry/qgldome.cpp
@@ -206,7 +206,7 @@ QGLBuilder& operator<<(QGLBuilder& builder, const QGLDome& dome)
     stackSin[stacks] = 1.0f;
 
     builder.newSection();
-    builder.currentNode()->setObjectName("Dome");
+    builder.currentNode()->setObjectName(QStringLiteral("Dome"));
     // Create the stacks for the dome part of the dome
     for (int stack = 0; stack < stacks; ++stack) {
         QGeometryData prim;
@@ -233,7 +233,7 @@ QGLBuilder& operator<<(QGLBuilder& builder, const QGLDome& dome)
     if (dome.baseEnabled()) {
         //Draw end-cap at bottom
         builder.newSection();
-        builder.currentNode()->setObjectName("Base");
+        builder.currentNode()->setObjectName(QStringLiteral("Base"));
 
         //Generate a circle of vertices for this layer.
         QGeometryData tempBase;
diff --git a/src/threed/scene/qglabstractscene.cpp b/src/threed/scene/qglabstractscene.cpp
index 5ad8109b3..751627c55 100644
--- a/src/threed/scene/qglabstractscene.cpp
+++ b/src/threed/scene/qglabstractscene.cpp
@@ -511,7 +511,7 @@ QStringList QGLAbstractScene::supportedFormats(QGLAbstractScene::FormatListType
                 for ( ; kit != formatKeys.constEnd(); ++kit)
                 {
                     QString k = *kit;
-                    if (!formatSet.contains(k) && !k.contains("/")) // dont add mime-type keys
+                    if (!formatSet.contains(k) && !k.contains(QLatin1Char('/'))) // dont add mime-type keys
                     {
                         if (t == AsFilter)
                             k.prepend(QLatin1String("*."));
diff --git a/src/threed/textures/qgltexture2d.cpp b/src/threed/textures/qgltexture2d.cpp
index 6ddf6cd5a..80aef9478 100644
--- a/src/threed/textures/qgltexture2d.cpp
+++ b/src/threed/textures/qgltexture2d.cpp
@@ -388,8 +388,8 @@ void QGLTexture2D::setUrl(const QUrl &url)
             if (url.scheme().toLower() == QLatin1String("qrc")) {
                 // strips off any qrc: prefix and any excess slashes and replaces it with :/
                 QUrl tempUrl(url);
-                tempUrl.setScheme("");
-                fileName = QLatin1String(":")+tempUrl.toString();
+                tempUrl.setScheme(QString());
+                fileName = QLatin1Char(':')+tempUrl.toString();
             }
             
             if (fileName.endsWith(QLatin1String(".dds"), Qt::CaseInsensitive))
diff --git a/src/threed/threed.pro b/src/threed/threed.pro
index 70430a2ec..cbc88ef67 100644
--- a/src/threed/threed.pro
+++ b/src/threed/threed.pro
@@ -2,7 +2,7 @@ load(qt_module)
 
 TARGET     = Qt3D
 MODULE     = qt3d
-QT         = core-private gui-private opengl network
+QT         = core-private gui-private opengl network widgets
 
 CONFIG += module
 MODULE_PRI = ../../modules/qt_qt3d.pri
diff --git a/tests/auto/threed/qglmaterial/tst_qglmaterial.cpp b/tests/auto/threed/qglmaterial/tst_qglmaterial.cpp
index b2b6ce9d4..37d0ef038 100644
--- a/tests/auto/threed/qglmaterial/tst_qglmaterial.cpp
+++ b/tests/auto/threed/qglmaterial/tst_qglmaterial.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
+#include <QtGui/QOpenGLContext>
 #include "qglmaterial.h"
 #include "qglcolormaterial.h"
 #include "qgltwosidedmaterial.h"
diff --git a/tests/auto/threed/qglpainter/tst_qglpainter.cpp b/tests/auto/threed/qglpainter/tst_qglpainter.cpp
index d20f32da8..7c4af2571 100644
--- a/tests/auto/threed/qglpainter/tst_qglpainter.cpp
+++ b/tests/auto/threed/qglpainter/tst_qglpainter.cpp
@@ -41,6 +41,8 @@
 
 #include <QtTest/QtTest>
 #include <QtGui/qpainter.h>
+#include <QtGui/QOpenGLContext>
+
 #include "qgltestwidget.h"
 #include "qglpainter.h"
 #include "qglsimulator.h"
diff --git a/tests/auto/threed/qglrender/tst_qglrender.cpp b/tests/auto/threed/qglrender/tst_qglrender.cpp
index 769cd74c4..7516fb374 100644
--- a/tests/auto/threed/qglrender/tst_qglrender.cpp
+++ b/tests/auto/threed/qglrender/tst_qglrender.cpp
@@ -41,6 +41,8 @@
 
 #include <QtTest/QtTest>
 
+#include <QtGui/QOpenGLContext>
+
 #include "qglrenderorder.h"
 #include "qglrendersequencer.h"
 #include "qglrenderordercomparator.h"
diff --git a/tests/auto/threed/qglscenenode/tst_qglscenenode.cpp b/tests/auto/threed/qglscenenode/tst_qglscenenode.cpp
index 89a85438f..c02fa5b2b 100644
--- a/tests/auto/threed/qglscenenode/tst_qglscenenode.cpp
+++ b/tests/auto/threed/qglscenenode/tst_qglscenenode.cpp
@@ -40,6 +40,8 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
+#include <QtGui/QOpenGLContext>
+
 #include "qglscenenode.h"
 #include "qglpainter.h"
 #include "qglabstracteffect.h"
diff --git a/tests/auto/threed/qglsharedresource/qglsharedresource.pro b/tests/auto/threed/qglsharedresource/qglsharedresource.pro
index 9032bd408..4f1ed637d 100644
--- a/tests/auto/threed/qglsharedresource/qglsharedresource.pro
+++ b/tests/auto/threed/qglsharedresource/qglsharedresource.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qglsharedresource
 CONFIG += testcase
 TEMPLATE=app
-QT += testlib qt3d
+QT += testlib qt3d opengl widgets
 CONFIG += warn_on
 
 INCLUDEPATH += ../../../../src/threed/textures
diff --git a/tests/auto/threed/qglvertexbundle/qglvertexbundle.pro b/tests/auto/threed/qglvertexbundle/qglvertexbundle.pro
index c9492258c..a3e566c90 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
+QT += testlib qt3d opengl widgets
 CONFIG += warn_on
 
 SOURCES += tst_qglvertexbundle.cpp
diff --git a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro
index b466ee325..c242a2e48 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 += quick3d
+QT += declarative 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 33b5f0039..b7afdea65 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 += quick3d
+QT += declarative quick3d
 
 SOURCES += main.cpp
 HEADERS += ../qmlres.h