QtQuick: Fix compiler warnings.

Mostly introduced by fdd14a1a10a0a2f42015b30071771bd95215cc1a.

Change-Id: Ief4c33412ef80923de2f91e62bb89c18267a14f3
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

diff --git a/src/quick/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp
index d93f774..432d167 100644 (file)
--- a/src/quick/items/qquickcanvas.cpp
+++ b/src/quick/items/qquickcanvas.cpp
@@ -45,10 +45,10 @@
 #include "qquickitem.h"
 #include "qquickitem_p.h"
 
-#include <private/qsgrenderer_p.h>
-#include <private/qsgtexture_p.h>
-#include <private/qsgflashnode_p.h>
-#include <qsgengine.h>
+#include <QtQuick/private/qsgrenderer_p.h>
+#include <QtQuick/private/qsgtexture_p.h>
+#include <QtQuick/private/qsgflashnode_p.h>
+#include <QtQuick/qsgengine.h>
 
 #include <private/qquickwindowmanager_p.h>
 

diff --git a/src/quick/items/qquickwindowmanager.cpp b/src/quick/items/qquickwindowmanager.cpp
index c6baf13..d1b5275 100644 (file)
--- a/src/quick/items/qquickwindowmanager.cpp
+++ b/src/quick/items/qquickwindowmanager.cpp
@@ -1071,7 +1071,6 @@ void QQuickRenderThreadSingleContextWindowManager::maybeUpdate(QQuickCanvas *can
         printf("GUI: doing update...\n");
 #endif
         renderThreadAwakened = true;
-        bool locked = false;
 
         // If we are getting here from the renderer's sync event, the renderer is about
         // to go to sleep anyway.

diff --git a/src/quick/items/qquickwindowmodule.cpp b/src/quick/items/qquickwindowmodule.cpp
index 23ca00d..1ef4bc1 100644 (file)
--- a/src/quick/items/qquickwindowmodule.cpp
+++ b/src/quick/items/qquickwindowmodule.cpp
@@ -47,10 +47,10 @@ QT_BEGIN_NAMESPACE
 
 void QQuickWindowModule::defineModule()
 {
-    const char* uri = "QtQuick.Window";
+    const char uri[] = "QtQuick.Window";
 
     qmlRegisterType<QQuickCanvas>(uri, 2, 0, "Window");
-    qmlRegisterUncreatableType<QQuickScreen>(uri, 2, 0, "Screen", "Screen can only be used via the attached property.");
+    qmlRegisterUncreatableType<QQuickScreen>(uri, 2, 0, "Screen", QStringLiteral("Screen can only be used via the attached property."));
 }
 
 QT_END_NAMESPACE

diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index b83e328..a81571e 100644 (file)
--- a/src/quick/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -221,8 +221,6 @@ bool QSGContext::isReady() const
 
 void QSGContext::renderNextFrame(QSGRenderer *renderer, QOpenGLFramebufferObject *fbo)
 {
-    Q_D(QSGContext);
-
     if (fbo) {
         QSGBindableFbo bindable(fbo);
         renderer->renderScene(bindable);