From 41d01d0a065a96525e8a72ef189da6c96c4c1f95 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 12 Dec 2011 11:57:47 +0100
Subject: [PATCH] QtQuick: Fix compiler warnings.
Mostly introduced by fdd14a1a10a0a2f42015b30071771bd95215cc1a.
Change-Id: Ief4c33412ef80923de2f91e62bb89c18267a14f3
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
---
src/quick/items/qquickcanvas.cpp | 8 ++++----
src/quick/items/qquickwindowmanager.cpp | 1 -
src/quick/items/qquickwindowmodule.cpp | 4 ++--
src/quick/scenegraph/qsgcontext.cpp | 2 --
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/quick/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp
index d93f774207..432d167864 100644
--- 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 c6baf13758..d1b5275cc7 100644
--- 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 23ca00dd0a..1ef4bc1c89 100644
--- 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 b83e328158..a81571e5d8 100644
--- 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);
--
GitLab