14 files changed, 23 insertions, 19 deletions
diff --git a/src/qtquick1/graphicsitems/qdeclarativeborderimage.cpp b/src/qtquick1/graphicsitems/qdeclarativeborderimage.cpp
index 63b00d1114..1beef966f0 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativeborderimage.cpp
@@ -49,6 +49,8 @@
 #include <QNetworkReply>
 #include <QFile>
 
+#include <QtWidgets/qdrawutil.h>
+
 QT_BEGIN_NAMESPACE
 
 
diff --git a/src/qtquick1/graphicsitems/qdeclarativeflipable.cpp b/src/qtquick1/graphicsitems/qdeclarativeflipable.cpp
index a3aba31c57..e9c23b4dfd 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeflipable.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativeflipable.cpp
@@ -46,7 +46,7 @@
 
 #include <QtDeclarative/qdeclarativeinfo.h>
 
-#include <QtGui/qgraphicstransform.h>
+#include <QtWidgets/qgraphicstransform.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qtquick1/graphicsitems/qdeclarativefocuspanel.cpp b/src/qtquick1/graphicsitems/qdeclarativefocuspanel.cpp
index 4797033bff..b3285716ca 100644
--- a/src/qtquick1/graphicsitems/qdeclarativefocuspanel.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativefocuspanel.cpp
@@ -43,7 +43,7 @@
 
 #include "QtQuick1/private/qdeclarativeitem_p.h"
 
-#include <QtGui/qgraphicsscene.h>
+#include <QtWidgets/qgraphicsscene.h>
 #include <QEvent>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp
index a480cb28fe..c719067e2e 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp
@@ -60,9 +60,10 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QtCore/qnumeric.h>
 #include <QtDeclarative/qjsengine.h>
-#include <QtGui/qgraphicstransform.h>
 
 #include <private/qv8engine_p.h>
+#include <QtWidgets/qgraphicstransform.h>
+#include <private/qlistmodelinterface_p.h>
 
 #include <float.h>
 
@@ -2896,7 +2897,7 @@ QDeclarativeListProperty<QDeclarative1Transition> QDeclarativeItemPrivate::trans
 
   If clipping is enabled, an item will clip its own painting, as well
   as the painting of its children, to its bounding rectangle. If you set
-  clipping during an item's paint operation, remember to re-set it to 
+  clipping during an item's paint operation, remember to re-set it to
   prevent clipping the rest of your scene.
 
   Non-rectangular clipping regions are not supported for performance reasons.
diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem.h b/src/qtquick1/graphicsitems/qdeclarativeitem.h
index a3f4931316..609af803f6 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeitem.h
+++ b/src/qtquick1/graphicsitems/qdeclarativeitem.h
@@ -47,10 +47,10 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QList>
-#include <QtGui/qgraphicsitem.h>
-#include <QtGui/qgraphicstransform.h>
 #include <QtGui/qfont.h>
-#include <QtGui/qaction.h>
+#include <QtWidgets/qgraphicsitem.h>
+#include <QtWidgets/qgraphicstransform.h>
+#include <QtWidgets/qaction.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem_p.h b/src/qtquick1/graphicsitems/qdeclarativeitem_p.h
index 58d57abbf3..0604194004 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeitem_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativeitem_p.h
@@ -72,7 +72,7 @@
 #include <QtCore/qrect.h>
 #include <QtCore/qdebug.h>
 
-#include <private/qgraphicsitem_p.h>
+#include <QtWidgets/private/qgraphicsitem_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qtquick1/graphicsitems/qdeclarativeitemsmodule.cpp b/src/qtquick1/graphicsitems/qdeclarativeitemsmodule.cpp
index 47fd2ddf38..0a20b949b8 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -41,10 +41,10 @@
 
 #include "QtQuick1/private/qdeclarativeitemsmodule_p.h"
 
-#include <QtGui/qaction.h>
+#include <QtWidgets/qaction.h>
 #include <QtGui/qvalidator.h>
-#include <QtGui/qgraphicseffect.h>
-#include <QtGui/qgraphicsitem.h>
+#include <QtWidgets/qgraphicseffect.h>
+#include <QtWidgets/qgraphicsitem.h>
 
 #include "QtQuick1/private/qdeclarativeevents_p_p.h"
 #include "QtQuick1/private/qdeclarativescalegrid_p_p.h"
diff --git a/src/qtquick1/graphicsitems/qdeclarativerectangle.cpp b/src/qtquick1/graphicsitems/qdeclarativerectangle.cpp
index 32f8197192..088c296a26 100644
--- a/src/qtquick1/graphicsitems/qdeclarativerectangle.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativerectangle.cpp
@@ -45,6 +45,7 @@
 #include <QPainter>
 #include <QStringBuilder>
 #include <QtCore/qmath.h>
+#include <QtWidgets/qdrawutil.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp b/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp
index a14d837be0..271595a863 100644
--- a/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp
@@ -900,7 +900,7 @@ void QDeclarative1TextInput::setEchoMode(QDeclarative1TextInput::EchoMode echo)
     Q_D(QDeclarative1TextInput);
     if (echoMode() == echo)
         return;
-    d->control->setEchoMode((uint)echo);
+    d->control->setEchoMode((QLineControl::EchoMode)echo);
     d->updateInputMethodHints();
     q_textChanged();
     emit echoModeChanged(echoMode());
diff --git a/src/qtquick1/qtquick1.pro b/src/qtquick1/qtquick1.pro
index 8e44d9c0ef..66f2c848f2 100644
--- a/src/qtquick1/qtquick1.pro
+++ b/src/qtquick1/qtquick1.pro
@@ -7,7 +7,7 @@ CONFIG += module
 CONFIG += dll warn_on
 MODULE_PRI += ../../modules/qt_qtquick1.pri
 
-QT += testlib-private declarative testlib declarative-private core-private gui-private network v8-private
+QT += testlib-private declarative testlib declarative-private core-private gui-private network widgets-private v8-private
 DEFINES += QT_NO_URL_CAST_FROM_STRING
 
 load(qt_module_config)
diff --git a/src/qtquick1/util/qdeclarativeapplication.cpp b/src/qtquick1/util/qdeclarativeapplication.cpp
index 3cc572f27b..0947fe4f15 100644
--- a/src/qtquick1/util/qdeclarativeapplication.cpp
+++ b/src/qtquick1/util/qdeclarativeapplication.cpp
@@ -41,7 +41,7 @@
 
 #include "QtQuick1/private/qdeclarativeapplication_p.h"
 #include <private/qobject_p.h>
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qtquick1/util/qdeclarativestateoperations.cpp b/src/qtquick1/util/qdeclarativestateoperations.cpp
index e405fba34f..7d57083c59 100644
--- a/src/qtquick1/util/qdeclarativestateoperations.cpp
+++ b/src/qtquick1/util/qdeclarativestateoperations.cpp
@@ -55,7 +55,7 @@
 #include <QtQuick1/private/qdeclarativestate_p_p.h>
 
 #include <QtCore/qdebug.h>
-#include <QtGui/qgraphicsitem.h>
+#include <QtWidgets/qgraphicsitem.h>
 #include <QtCore/qmath.h>
 
 #include <private/qobject_p.h>
diff --git a/src/qtquick1/util/qdeclarativeview.cpp b/src/qtquick1/util/qdeclarativeview.cpp
index d10d34fcd1..fd5f9debf7 100644
--- a/src/qtquick1/util/qdeclarativeview.cpp
+++ b/src/qtquick1/util/qdeclarativeview.cpp
@@ -64,8 +64,8 @@
 #include <qgraphicswidget.h>
 #include <qbasictimer.h>
 #include <QtCore/qabstractanimation.h>
-#include <private/qgraphicsview_p.h>
 #include <QtQuick1/private/qdeclarativeitem_p.h>
+#include <QtWidgets/private/qgraphicsview_p.h>
 #include <private/qabstractanimation_p.h>
 #include <QtQuick1/private/qdeclarativeitemchangelistener_p.h>
 
diff --git a/src/qtquick1/util/qdeclarativeview.h b/src/qtquick1/util/qdeclarativeview.h
index 39a2322f99..b655d2830f 100644
--- a/src/qtquick1/util/qdeclarativeview.h
+++ b/src/qtquick1/util/qdeclarativeview.h
@@ -44,9 +44,9 @@
 
 #include <QtCore/qdatetime.h>
 #include <QtCore/qurl.h>
-#include <QtGui/qgraphicssceneevent.h>
-#include <QtGui/qgraphicsview.h>
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qgraphicssceneevent.h>
+#include <QtWidgets/qgraphicsview.h>
+#include <QtWidgets/qwidget.h>
 
 QT_BEGIN_HEADER