Fix compilation due to header changes

- Fix QtGui/QApplication => QtWidgets/QApplication
- Fix QtGui/QStylePlugin => QtWidgets/QStylePlugin
- Fix QtWidgets/QStringListModel => QtCore/QStringListModel
- Fix QtWidgets/qstringlistmodel.h => QtCore/qstringlistmodel.h

Change-Id: I8df28f032f039107b900c81be27d2d6e5e69e06e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>

12 files changed, 12 insertions, 12 deletions

diff --git a/examples/embedded/qmlcalculator/qmlcalculator.cpp b/examples/embedded/qmlcalculator/qmlcalculator.cpp
index 94cb00f4a2..26c56c0a33 100644
--- a/examples/embedded/qmlcalculator/qmlcalculator.cpp
+++ b/examples/embedded/qmlcalculator/qmlcalculator.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtCore/QFileInfo>
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include <QtDeclarative/QDeclarativeView>
 #include <QtDeclarative/QDeclarativeEngine>
 
diff --git a/examples/embedded/qmlclocks/qmlclocks.cpp b/examples/embedded/qmlclocks/qmlclocks.cpp
index 04366aa0ab..ed477260a9 100644
--- a/examples/embedded/qmlclocks/qmlclocks.cpp
+++ b/examples/embedded/qmlclocks/qmlclocks.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtCore/QFileInfo>
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include <QtDeclarative/QDeclarativeView>
 #include <QtDeclarative/QDeclarativeEngine>
 
diff --git a/examples/embedded/qmldialcontrol/qmldialcontrol.cpp b/examples/embedded/qmldialcontrol/qmldialcontrol.cpp
index 6f9b0e574a..a5929ca4c0 100644
--- a/examples/embedded/qmldialcontrol/qmldialcontrol.cpp
+++ b/examples/embedded/qmldialcontrol/qmldialcontrol.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtCore/QFileInfo>
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include <QtDeclarative/QDeclarativeView>
 #include <QtDeclarative/QDeclarativeEngine>
 
diff --git a/examples/embedded/qmleasing/qmleasing.cpp b/examples/embedded/qmleasing/qmleasing.cpp
index 3e24546b4a..477dd9e6a1 100644
--- a/examples/embedded/qmleasing/qmleasing.cpp
+++ b/examples/embedded/qmleasing/qmleasing.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtCore/QFileInfo>
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include <QtDeclarative/QDeclarativeView>
 #include <QtDeclarative/QDeclarativeEngine>
 
diff --git a/examples/embedded/qmlflickr/qmlflickr.cpp b/examples/embedded/qmlflickr/qmlflickr.cpp
index dc7b5ee397..e706ea1463 100644
--- a/examples/embedded/qmlflickr/qmlflickr.cpp
+++ b/examples/embedded/qmlflickr/qmlflickr.cpp
@@ -41,7 +41,7 @@
 
 #include <QtCore/QFileInfo>
 #include <QtCore/QSettings>
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include <QtDeclarative/QDeclarativeView>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeNetworkAccessManagerFactory>
diff --git a/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp b/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp
index 16135a7851..3e4d950229 100644
--- a/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp
+++ b/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp
@@ -41,7 +41,7 @@
 
 #include <QtCore/QFileInfo>
 #include <QtCore/QSettings>
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include <QtDeclarative/QDeclarativeView>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeNetworkAccessManagerFactory>
diff --git a/examples/embedded/qmltwitter/qmltwitter.cpp b/examples/embedded/qmltwitter/qmltwitter.cpp
index 5485028aff..cfbde3c277 100644
--- a/examples/embedded/qmltwitter/qmltwitter.cpp
+++ b/examples/embedded/qmltwitter/qmltwitter.cpp
@@ -41,7 +41,7 @@
 
 #include <QtCore/QFileInfo>
 #include <QtCore/QSettings>
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include <QtDeclarative/QDeclarativeView>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeNetworkAccessManagerFactory>
diff --git a/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h b/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h
index 95b0abef92..55f1973791 100644
--- a/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h
+++ b/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h
@@ -42,7 +42,7 @@
 #ifndef QMLOSTPLUGIN_H
 #define QMLOSTPLUGIN_H
 
-#include <QtGui/QStylePlugin>
+#include <QtWidgets/QStylePlugin>
 #include <QtDeclarative/private/qdeclarativedebugserverconnection_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp
index 4a332320f1..fac6a9960c 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 <QtWidgets/qstringlistmodel.h>
+#include <QtCore/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 835623f53c..2682789e0e 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 <QtWidgets/QStringListModel>
+#include <QtCore/QStringListModel>
 #include <QtQuick1/qdeclarativeview.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecontext.h>
diff --git a/tests/auto/qtquick2/qquickgridview/tst_qquickgridview.cpp b/tests/auto/qtquick2/qquickgridview/tst_qquickgridview.cpp
index b1edb2246b..9ceafffbe9 100644
--- a/tests/auto/qtquick2/qquickgridview/tst_qquickgridview.cpp
+++ b/tests/auto/qtquick2/qquickgridview/tst_qquickgridview.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <QtWidgets/qstringlistmodel.h>
+#include <QtCore/qstringlistmodel.h>
 #include <QtQuick/qquickview.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
diff --git a/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp b/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp
index bd92b91e32..cfd3435919 100644
--- a/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <QtWidgets/QStringListModel>
+#include <QtCore/QStringListModel>
 #include <QtQuick/qquickview.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecontext.h>