From a2e68623019cbbeca3c98ce7a6109b7f301ebddf Mon Sep 17 00:00:00 2001
From: Matthew Cattell <matthew.cattell@nokia.com>
Date: Fri, 9 Sep 2011 14:53:01 +0200
Subject: partial build fix of qtquick1 autotests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ic2106ec80e1e5402f4f9bf71cc4cf23ec4657046
Reviewed-on: http://codereview.qt-project.org/4546
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 tests/auto/qtquick1/qdeclarativeanchors/tst_qdeclarativeanchors.cpp   | 4 ++--
 .../qtquick1/qdeclarativeapplication/tst_qdeclarativeapplication.cpp  | 4 ++--
 .../auto/qtquick1/qdeclarativeflickable/tst_qdeclarativeflickable.cpp | 2 +-
 tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp | 2 +-
 tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp | 2 +-
 tests/auto/qtquick1/qdeclarativeloader/tst_qdeclarativeloader.cpp     | 4 ++--
 .../qtquick1/qdeclarativepositioners/tst_qdeclarativepositioners.cpp  | 2 +-
 tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp         | 2 +-
 tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp | 2 +-
 .../auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp | 2 +-
 tools/qmlviewer/qmlruntime.cpp                                        | 4 ++--
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/auto/qtquick1/qdeclarativeanchors/tst_qdeclarativeanchors.cpp b/tests/auto/qtquick1/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
index 795c91e9c4..7aef248bb6 100644
--- a/tests/auto/qtquick1/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
+++ b/tests/auto/qtquick1/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 #include <qtest.h>
 #include <QSignalSpy>
-#include <QtGui/QGraphicsWidget>
-#include <private/qgraphicsitem_p.h>
+#include <QtWidgets/QGraphicsWidget>
+#include <QtWidgets/5.0.0/QtWidgets/private/qgraphicsitem_p.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtQuick1/qdeclarativeview.h>
diff --git a/tests/auto/qtquick1/qdeclarativeapplication/tst_qdeclarativeapplication.cpp b/tests/auto/qtquick1/qdeclarativeapplication/tst_qdeclarativeapplication.cpp
index dfb2329668..14765e41db 100644
--- a/tests/auto/qtquick1/qdeclarativeapplication/tst_qdeclarativeapplication.cpp
+++ b/tests/auto/qtquick1/qdeclarativeapplication/tst_qdeclarativeapplication.cpp
@@ -44,8 +44,8 @@
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtQuick1/qdeclarativeitem.h>
-#include <QtGui/qgraphicsview.h>
-#include <QtGui/qgraphicsscene.h>
+#include <QtWidgets/qgraphicsview.h>
+#include <QtWidgets/QGraphicsScene>
 
 class tst_qdeclarativeapplication : public QObject
 {
diff --git a/tests/auto/qtquick1/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/qtquick1/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
index a0473a620b..80bf71a191 100644
--- a/tests/auto/qtquick1/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
+++ b/tests/auto/qtquick1/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
@@ -45,7 +45,7 @@
 #include <QtQuick1/qdeclarativeview.h>
 #include <private/qdeclarativeflickable_p.h>
 #include <private/qdeclarativevaluetype_p.h>
-#include <QtGui/qgraphicswidget.h>
+#include <QtWidgets/qgraphicswidget.h>
 #include <math.h>
 #include "../../../shared/util.h"
 
diff --git a/tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp
index 606b5fcab8..e96af5100c 100644
--- a/tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp
+++ b/tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <QtGui/qstringlistmodel.h>
+#include <QtWidgets/qstringlistmodel.h>
 #include <QtQuick1/qdeclarativeview.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
diff --git a/tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp
index d2519b0f9f..c9cce3d6b3 100644
--- a/tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp
+++ b/tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <QtGui/QStringListModel>
+#include <QtWidgets/QStringListModel>
 #include <QtQuick1/qdeclarativeview.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecontext.h>
diff --git a/tests/auto/qtquick1/qdeclarativeloader/tst_qdeclarativeloader.cpp b/tests/auto/qtquick1/qdeclarativeloader/tst_qdeclarativeloader.cpp
index baed4973dc..e73f9e0cf3 100644
--- a/tests/auto/qtquick1/qdeclarativeloader/tst_qdeclarativeloader.cpp
+++ b/tests/auto/qtquick1/qdeclarativeloader/tst_qdeclarativeloader.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtGui/QGraphicsWidget>
-#include <QtGui/QGraphicsScene>
+#include <QtWidgets/QGraphicsWidget>
+#include <QtWidgets/QGraphicsScene>
 
 #include <QSignalSpy>
 #include <QtDeclarative/qdeclarativeengine.h>
diff --git a/tests/auto/qtquick1/qdeclarativepositioners/tst_qdeclarativepositioners.cpp b/tests/auto/qtquick1/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
index 60ad1033fe..32eba6132b 100644
--- a/tests/auto/qtquick1/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
+++ b/tests/auto/qtquick1/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
@@ -46,7 +46,7 @@
 #include <QtQuick1/private/qdeclarativetransition_p.h>
 #include <QtQuick1/private/qdeclarativeitem_p.h>
 #include <qdeclarativeexpression.h>
-#include <QtGui/qgraphicswidget.h>
+#include <QtWidgets/qgraphicswidget.h>
 #include "../../../shared/util.h"
 
 #ifdef Q_OS_SYMBIAN
diff --git a/tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp
index 8398ec6061..801d631629 100644
--- a/tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp
+++ b/tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp
@@ -49,7 +49,7 @@
 #include <QGraphicsSceneMouseEvent>
 #include <qmath.h>
 #include <QtQuick1/QDeclarativeView>
-#include <private/qapplication_p.h>
+#include <QtWidgets/5.0.0/QtWidgets/private/qapplication_p.h>
 #include <limits.h>
 
 #include "../../../shared/util.h"
diff --git a/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index 76f4687e2e..3af539f5eb 100644
--- a/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -58,7 +58,7 @@
 #include <QInputContext>
 #include <QClipboard>
 #include <QMimeData>
-#include <private/qapplication_p.h>
+#include <QtWidgets/5.0.0/QtWidgets/private/qapplication_p.h>
 #include <private/qtextcontrol_p.h>
 
 #ifdef Q_OS_SYMBIAN
diff --git a/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index 2d86a4b038..413f04d496 100644
--- a/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -50,7 +50,7 @@
 #include <QDir>
 #include <QStyle>
 #include <QInputContext>
-#include <private/qapplication_p.h>
+#include <QtWidgets/5.0.0/QtWidgets/private/qapplication_p.h>
 
 #ifdef Q_OS_SYMBIAN
 // In Symbian OS test data is located in applications private dir
diff --git a/tools/qmlviewer/qmlruntime.cpp b/tools/qmlviewer/qmlruntime.cpp
index c5b94abac7..377dae38ee 100644
--- a/tools/qmlviewer/qmlruntime.cpp
+++ b/tools/qmlviewer/qmlruntime.cpp
@@ -1182,7 +1182,7 @@ void QDeclarativeViewer::sceneResized(QSize)
 void QDeclarativeViewer::initialSizeChanged(QSize size)
 {
     if (!isFullScreen() && !isMaximized()) {
-        canvas->setFixedSize(size);
+        canvas->setGeometry(0,0,size.width(),size.height());
         layout()->setSizeConstraint(QLayout::SetFixedSize);
         layout()->activate();
     }
@@ -1532,7 +1532,7 @@ void QDeclarativeViewer::updateSizeHints(bool initial)
         QSize newWindowSize = initial ? initialSize : canvas->sizeHint();
         //qWarning() << "USH:" << (initial ? "INIT:" : "V2R:") << "setting fixed size " << newWindowSize;
         if (!isFullScreen() && !isMaximized()) {
-            canvas->setFixedSize(newWindowSize);
+            canvas->setGeometry(0,0,newWindowSize.width(),newWindowSize.height());
             resize(1, 1);
             layout()->setSizeConstraint(QLayout::SetFixedSize);
             layout()->activate();
-- 
cgit v1.2.3