Merge remote branch 'staging/master' into refactor

Conflicts:
	src/opengl/qgl_qpa.cpp
	src/plugins/platforms/glxconvenience/qglxconvenience.cpp
	src/plugins/platforms/platforms.pro
	src/plugins/platforms/wayland/qwaylandwindow.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/plugins/platforms/xcb/qxcbwindow.h
	src/plugins/platforms/xcb/qxcbwindowsurface.cpp
	src/widgets/kernel/qwidget_qpa.cpp
	tests/auto/qvariant/tst_qvariant.cpp

1 files changed, 2 insertions, 1 deletions

diff --git a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
index 8f8ac67d09..b3e4a88edf 100644
--- a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
+++ b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
@@ -299,7 +299,7 @@ void tst_QGraphicsLinearLayout::alignment()
 
     int i;
     bool addWidget = true;
-    for (i = 0; i < sizeof(alignmentsToTest)/sizeof(Qt::Alignment); ++i) {
+    for (size_t i = 0; i < sizeof(alignmentsToTest)/sizeof(Qt::Alignment); ++i) {
         QGraphicsLayoutItem *loutItem;
         Qt::Alignment align = alignmentsToTest[i];
         if (!align && i > 0)
@@ -1139,6 +1139,7 @@ void tst_QGraphicsLinearLayout::testStretch()
 {
     QGraphicsScene scene;
     QGraphicsView *view = new QGraphicsView(&scene);
+    Q_UNUSED(view);
     QGraphicsWidget *form = new QGraphicsWidget(0, Qt::Window);
 
     scene.addItem(form);