Fix compilation due to header changes

- Fix QtWidgets/QAbstractProxyModel   => QtCore/QAbstractProxyModel
- Fix QtWidgets/QItemSelection        => QtCore/QItemSelection
- Fix QtWidgets/QItemSelectionModel   => QtCore/QItemSelectionModel
- Fix QtWidgets/QSortFilterProxyModel => QtCore/QSortFilterProxyModel
- Fix QtWidgets/QStringListModel      => QtCore/QStringListModel

Change-Id: Id410fb4c6ae89d32eac3242b9a8cbfb3442b0555
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>

diff --git a/src/assistant/assistant/bookmarkfiltermodel.h b/src/assistant/assistant/bookmarkfiltermodel.h
index aae160d..a2a165b 100644 (file)
--- a/src/assistant/assistant/bookmarkfiltermodel.h
+++ b/src/assistant/assistant/bookmarkfiltermodel.h
@@ -43,8 +43,8 @@
 
 #include <QtCore/QPersistentModelIndex>
 
-#include <QtWidgets/QAbstractProxyModel>
-#include <QtWidgets/QSortFilterProxyModel>
+#include <QtCore/QAbstractProxyModel>
+#include <QtCore/QSortFilterProxyModel>
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/assistant/assistant/bookmarkmanager.cpp b/src/assistant/assistant/bookmarkmanager.cpp
index a32bac3..8f7f5df 100644 (file)
--- a/src/assistant/assistant/bookmarkmanager.cpp
+++ b/src/assistant/assistant/bookmarkmanager.cpp
@@ -52,7 +52,7 @@
 #include <QtWidgets/QMenu>
 #include <QtGui/QKeyEvent>
 #include <QtWidgets/QMessageBox>
-#include <QtWidgets/QSortFilterProxyModel>
+#include <QtCore/QSortFilterProxyModel>
 #include <QtWidgets/QToolBar>
 
 QT_BEGIN_NAMESPACE

diff --git a/src/assistant/help/qhelpindexwidget.h b/src/assistant/help/qhelpindexwidget.h
index 6f911e7..d48de42 100644 (file)
--- a/src/assistant/help/qhelpindexwidget.h
+++ b/src/assistant/help/qhelpindexwidget.h
@@ -45,7 +45,7 @@
 #include <QtHelp/qhelp_global.h>
 
 #include <QtCore/QUrl>
-#include <QtWidgets/QStringListModel>
+#include <QtCore/QStringListModel>
 #include <QtWidgets/QListView>
 
 QT_BEGIN_HEADER

diff --git a/src/designer/src/components/objectinspector/objectinspector.cpp b/src/designer/src/components/objectinspector/objectinspector.cpp
index 91fe694..c831e46 100644 (file)
--- a/src/designer/src/components/objectinspector/objectinspector.cpp
+++ b/src/designer/src/components/objectinspector/objectinspector.cpp
@@ -68,7 +68,7 @@
 #include <QtWidgets/QScrollBar>
 #include <QtGui/QPainter>
 #include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QItemSelectionModel>
+#include <QtCore/QItemSelectionModel>
 #include <QtWidgets/QMenu>
 #include <QtWidgets/QTreeView>
 #include <QtWidgets/QItemDelegate>

diff --git a/src/designer/src/components/propertyeditor/stringlisteditor.cpp b/src/designer/src/components/propertyeditor/stringlisteditor.cpp
index c90815b..cf9d987 100644 (file)
--- a/src/designer/src/components/propertyeditor/stringlisteditor.cpp
+++ b/src/designer/src/components/propertyeditor/stringlisteditor.cpp
@@ -41,7 +41,7 @@
 
 #include "stringlisteditor.h"
 #include <iconloader_p.h>
-#include <QtWidgets/QStringListModel>
+#include <QtCore/QStringListModel>
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
index 3b695ca..54d28c2 100644 (file)
--- a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
@@ -63,7 +63,7 @@
 #include <QtWidgets/QAction>
 #include <QtWidgets/QButtonGroup>
 #include <QtWidgets/QMenu>
-#include <QtWidgets/QSortFilterProxyModel>
+#include <QtCore/QSortFilterProxyModel>
 #include <QtWidgets/QStandardItemModel>
 #include <QtWidgets/QComboBox>
 #include <QtWidgets/QApplication>

diff --git a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
index 8fa28b3..f29d90e 100644 (file)
--- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
@@ -50,7 +50,7 @@
 #include <QtWidgets/QListView>
 #include <QtWidgets/QLineEdit>
 #include <QtWidgets/QItemDelegate>
-#include <QtWidgets/QSortFilterProxyModel>
+#include <QtCore/QSortFilterProxyModel>
 
 #include <QtCore/QAbstractListModel>
 #include <QtCore/QList>

diff --git a/src/designer/src/lib/shared/actioneditor.cpp b/src/designer/src/lib/shared/actioneditor.cpp
index 4174132..67e695e 100644 (file)
--- a/src/designer/src/lib/shared/actioneditor.cpp
+++ b/src/designer/src/lib/shared/actioneditor.cpp
@@ -74,7 +74,7 @@
 #include <QtWidgets/QPushButton>
 #include <QtWidgets/QToolButton>
 #include <QtGui/QContextMenuEvent>
-#include <QtWidgets/QItemSelection>
+#include <QtCore/QItemSelection>
 
 #include <QtCore/QRegExp>
 #include <QtCore/QDebug>

diff --git a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp
index d4fadc2..f302954 100644 (file)
--- a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp
+++ b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp
@@ -60,8 +60,8 @@
 #include <QtWidgets/QTreeView>
 #include <QtWidgets/QHeaderView>
 #include <QtWidgets/QPushButton>
-#include <QtWidgets/QItemSelectionModel>
-#include <QtWidgets/QItemSelection>
+#include <QtCore/QItemSelectionModel>
+#include <QtCore/QItemSelection>
 #include <QtWidgets/QComboBox>
 #include <QtWidgets/QLineEdit>
 #include <QtWidgets/QCheckBox>

diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp
index 893baa4..e12cb23 100644 (file)
--- a/src/qdbus/qdbusviewer/qdbusviewer.cpp
+++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp
@@ -46,8 +46,8 @@
 #include <QtXml/QtXml>
 
 #include <QtWidgets/QTreeWidget>
-#include <QtWidgets/QStringListModel>
-#include <QtWidgets/QSortFilterProxyModel>
+#include <QtCore/QStringListModel>
+#include <QtCore/QSortFilterProxyModel>
 #include <QtWidgets/QLineEdit>
 #include <QtWidgets/QListView>
 #include <QtWidgets/QTextBrowser>