Port QStandardItem/QStandardItemModel includes to QtGui

Change-Id: Ic2842dc4d1814e43b07faae0fd72fb2ce4ce1125
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/designer/src/components/objectinspector/objectinspectormodel_p.h b/src/designer/src/components/objectinspector/objectinspectormodel_p.h
index dc18cf8..46ec1ac 100644 (file)
--- a/src/designer/src/components/objectinspector/objectinspectormodel_p.h
+++ b/src/designer/src/components/objectinspector/objectinspectormodel_p.h
@@ -55,7 +55,7 @@
 
 #include <layoutinfo_p.h>
 
-#include <QtWidgets/QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 #include <QtGui/QIcon>
 #include <QtCore/QModelIndex>
 #include <QtCore/QString>

diff --git a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
index 0f22efc..9c5974a 100644 (file)
--- a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
@@ -64,7 +64,7 @@
 #include <QtWidgets/QButtonGroup>
 #include <QtWidgets/QMenu>
 #include <QtCore/QSortFilterProxyModel>
-#include <QtWidgets/QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 #include <QtWidgets/QComboBox>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QItemDelegate>

diff --git a/src/designer/src/designer/appfontdialog.cpp b/src/designer/src/designer/appfontdialog.cpp
index d5ce890..29eb76e 100644 (file)
--- a/src/designer/src/designer/appfontdialog.cpp
+++ b/src/designer/src/designer/appfontdialog.cpp
@@ -51,7 +51,7 @@
 #include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QSpacerItem>
 #include <QtWidgets/QFileDialog>
-#include <QtWidgets/QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 #include <QtWidgets/QMessageBox>
 #include <QtGui/QFontDatabase>
 #include <QtWidgets/QDialogButtonBox>

diff --git a/src/designer/src/lib/shared/actionrepository.cpp b/src/designer/src/lib/shared/actionrepository.cpp
index d28eace..43f1676 100644 (file)
--- a/src/designer/src/lib/shared/actionrepository.cpp
+++ b/src/designer/src/lib/shared/actionrepository.cpp
@@ -50,7 +50,7 @@
 
 #include <QtGui/QDrag>
 #include <QtGui/QContextMenuEvent>
-#include <QtWidgets/QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 #include <QtWidgets/QToolButton>
 #include <QtGui/QPixmap>
 #include <QtWidgets/QAction>

diff --git a/src/designer/src/lib/shared/actionrepository_p.h b/src/designer/src/lib/shared/actionrepository_p.h
index 26c1f99..6021111 100644 (file)
--- a/src/designer/src/lib/shared/actionrepository_p.h
+++ b/src/designer/src/lib/shared/actionrepository_p.h
@@ -55,7 +55,7 @@
 
 #include "shared_global_p.h"
 #include <QtCore/QMimeData>
-#include <QtWidgets/QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 #include <QtWidgets/QTreeView>
 #include <QtWidgets/QListView>
 #include <QtWidgets/QStackedWidget>

diff --git a/src/designer/src/lib/shared/promotionmodel.cpp b/src/designer/src/lib/shared/promotionmodel.cpp
index 8b3e973..19d881e 100644 (file)
--- a/src/designer/src/lib/shared/promotionmodel.cpp
+++ b/src/designer/src/lib/shared/promotionmodel.cpp
@@ -46,7 +46,7 @@
 #include <QtDesigner/QDesignerPromotionInterface>
 #include <QtDesigner/QDesignerFormEditorInterface>
 
-#include <QtWidgets/QStandardItem>
+#include <QtGui/QStandardItem>
 #include <QtCore/QCoreApplication>
 
 QT_BEGIN_NAMESPACE

diff --git a/src/designer/src/lib/shared/promotionmodel_p.h b/src/designer/src/lib/shared/promotionmodel_p.h
index 34c8cae..c89b050 100644 (file)
--- a/src/designer/src/lib/shared/promotionmodel_p.h
+++ b/src/designer/src/lib/shared/promotionmodel_p.h
@@ -53,7 +53,7 @@
 #ifndef PROMOTIONMODEL_H
 #define PROMOTIONMODEL_H
 
-#include <QtWidgets/QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 #include <QtCore/QSet>
 
 QT_BEGIN_NAMESPACE

diff --git a/src/designer/src/lib/shared/qtresourceeditordialog.cpp b/src/designer/src/lib/shared/qtresourceeditordialog.cpp
index 1d3d551..e68db7e 100644 (file)
--- a/src/designer/src/lib/shared/qtresourceeditordialog.cpp
+++ b/src/designer/src/lib/shared/qtresourceeditordialog.cpp
@@ -58,7 +58,7 @@
 #include <QtWidgets/QInputDialog>
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QPushButton>
-#include <QtWidgets/QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/designer/src/lib/shared/signalslotdialog.cpp b/src/designer/src/lib/shared/signalslotdialog.cpp
index 73c409f..a784753 100644 (file)
--- a/src/designer/src/lib/shared/signalslotdialog.cpp
+++ b/src/designer/src/lib/shared/signalslotdialog.cpp
@@ -54,7 +54,7 @@
 #include <QtDesigner/QDesignerWidgetFactoryInterface>
 #include <abstractdialoggui_p.h>
 
-#include <QtWidgets/QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 #include <QtGui/QRegExpValidator>
 #include <QtWidgets/QItemDelegate>
 #include <QtWidgets/QLineEdit>

diff --git a/src/designer/src/lib/shared/signalslotdialog_p.h b/src/designer/src/lib/shared/signalslotdialog_p.h
index 6ba8695..a0586f3 100644 (file)
--- a/src/designer/src/lib/shared/signalslotdialog_p.h
+++ b/src/designer/src/lib/shared/signalslotdialog_p.h
@@ -56,7 +56,7 @@
 #include "shared_global_p.h"
 #include <QtCore/QStringList>
 #include <QtWidgets/QDialog>
-#include <QtWidgets/QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/linguist/linguist/batchtranslationdialog.h b/src/linguist/linguist/batchtranslationdialog.h
index 701c5cf..9d3c68c 100644 (file)
--- a/src/linguist/linguist/batchtranslationdialog.h
+++ b/src/linguist/linguist/batchtranslationdialog.h
@@ -46,7 +46,7 @@
 #include "phrase.h"
 
 #include <QtWidgets/QDialog>
-#include <QtWidgets/QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/linguist/linguist/errorsview.cpp b/src/linguist/linguist/errorsview.cpp
index c2ca4fc..2a88014 100644 (file)
--- a/src/linguist/linguist/errorsview.cpp
+++ b/src/linguist/linguist/errorsview.cpp
@@ -47,9 +47,9 @@
 #include <QtCore/QString>
 #include <QtCore/QUrl>
 
+#include <QtGui/QStandardItem>
+#include <QtGui/QStandardItemModel>
 #include <QtWidgets/QListView>
-#include <QtWidgets/QStandardItem>
-#include <QtWidgets/QStandardItemModel>
 #include <QtWidgets/QTextEdit>
 #include <QtWidgets/QVBoxLayout>