From 467e4781e54ef80f763e3a4abacf9b1bbf1c9b43 2012-09-12 09:49:00
From: Marek Rosa <marek.rosa@digia.com>
Date: 2012-09-12 09:49:00
Subject: [PATCH] Qt5: fixed QApplication and QWidget includes

---

diff --git a/demos/piechartcustomization/main.cpp b/demos/piechartcustomization/main.cpp
index a60b090..9af6d34 100644
--- a/demos/piechartcustomization/main.cpp
+++ b/demos/piechartcustomization/main.cpp
@@ -19,7 +19,7 @@
 ****************************************************************************/
 
 #include "mainwidget.h"
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QMainWindow>
 
 int main(int argc, char *argv[])
diff --git a/demos/qmlaxes/main.cpp b/demos/qmlaxes/main.cpp
index e30437d..93b694e 100644
--- a/demos/qmlaxes/main.cpp
+++ b/demos/qmlaxes/main.cpp
@@ -18,7 +18,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QDeclarativeEngine>
 #include "qmlapplicationviewer.h"
 
diff --git a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp
index 8ba6e88..6d37b0b 100644
--- a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -15,7 +15,7 @@
 #include <QtDeclarative/QDeclarativeComponent>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeContext>
-#include <QtGui/QApplication>
+#include <QApplication>
 
 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
 
diff --git a/demos/qmlchart/main.cpp b/demos/qmlchart/main.cpp
index c24846d..a35a763 100644
--- a/demos/qmlchart/main.cpp
+++ b/demos/qmlchart/main.cpp
@@ -18,7 +18,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QDeclarativeEngine>
 #include "qmlapplicationviewer.h"
 
diff --git a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp
index 8ba6e88..6d37b0b 100644
--- a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -15,7 +15,7 @@
 #include <QtDeclarative/QDeclarativeComponent>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeContext>
-#include <QtGui/QApplication>
+#include <QApplication>
 
 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
 
diff --git a/demos/qmlcustomizations/main.cpp b/demos/qmlcustomizations/main.cpp
index ed2aeb4..93b4251 100644
--- a/demos/qmlcustomizations/main.cpp
+++ b/demos/qmlcustomizations/main.cpp
@@ -18,7 +18,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QDeclarativeEngine>
 #include "qmlapplicationviewer.h"
 
diff --git a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp
index 8ba6e88..6d37b0b 100644
--- a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -15,7 +15,7 @@
 #include <QtDeclarative/QDeclarativeComponent>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeContext>
-#include <QtGui/QApplication>
+#include <QApplication>
 
 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
 
diff --git a/demos/qmlcustommodel/main.cpp b/demos/qmlcustommodel/main.cpp
index b6fd3e1..040c33a 100644
--- a/demos/qmlcustommodel/main.cpp
+++ b/demos/qmlcustommodel/main.cpp
@@ -18,7 +18,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QDeclarativeEngine>
 #include <QtDeclarative>
 #include <QAbstractItemModel>
diff --git a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp
index 8ba6e88..6d37b0b 100644
--- a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -15,7 +15,7 @@
 #include <QtDeclarative/QDeclarativeComponent>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeContext>
-#include <QtGui/QApplication>
+#include <QApplication>
 
 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
 
diff --git a/demos/qmloscilloscope/main.cpp b/demos/qmloscilloscope/main.cpp
index 62b78c4..b5ec392 100644
--- a/demos/qmloscilloscope/main.cpp
+++ b/demos/qmloscilloscope/main.cpp
@@ -18,7 +18,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QDeclarativeEngine>
 #include <QDeclarativeContext>
 #include "qmlapplicationviewer.h"
diff --git a/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp
index 8ba6e88..6d37b0b 100644
--- a/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -15,7 +15,7 @@
 #include <QtDeclarative/QDeclarativeComponent>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeContext>
-#include <QtGui/QApplication>
+#include <QApplication>
 
 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
 
diff --git a/examples/barmodelmapper/main.cpp b/examples/barmodelmapper/main.cpp
index 9b452ce..3cb39a8 100644
--- a/examples/barmodelmapper/main.cpp
+++ b/examples/barmodelmapper/main.cpp
@@ -18,7 +18,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "tablewidget.h"
 
 int main(int argc, char *argv[])
diff --git a/examples/barmodelmapper/tablewidget.h b/examples/barmodelmapper/tablewidget.h
index 731620a..801b5cf 100644
--- a/examples/barmodelmapper/tablewidget.h
+++ b/examples/barmodelmapper/tablewidget.h
@@ -21,7 +21,7 @@
 #ifndef TABLEWIDGET_H
 #define TABLEWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class TableWidget : public QWidget
 {
diff --git a/examples/modeldata/main.cpp b/examples/modeldata/main.cpp
index 9b452ce..3cb39a8 100644
--- a/examples/modeldata/main.cpp
+++ b/examples/modeldata/main.cpp
@@ -18,7 +18,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "tablewidget.h"
 
 int main(int argc, char *argv[])
diff --git a/examples/modeldata/tablewidget.h b/examples/modeldata/tablewidget.h
index 731620a..801b5cf 100644
--- a/examples/modeldata/tablewidget.h
+++ b/examples/modeldata/tablewidget.h
@@ -21,7 +21,7 @@
 #ifndef TABLEWIDGET_H
 #define TABLEWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class TableWidget : public QWidget
 {
diff --git a/examples/piechartdrilldown/main.cpp b/examples/piechartdrilldown/main.cpp
index cd73752..697f976 100644
--- a/examples/piechartdrilldown/main.cpp
+++ b/examples/piechartdrilldown/main.cpp
@@ -20,7 +20,7 @@
 
 #include "drilldownchart.h"
 #include "drilldownslice.h"
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QMainWindow>
 #include <QTime>
 #include <QChartView>
diff --git a/examples/qmlpiechart/main.cpp b/examples/qmlpiechart/main.cpp
index 6f90968..53e0b55 100644
--- a/examples/qmlpiechart/main.cpp
+++ b/examples/qmlpiechart/main.cpp
@@ -18,7 +18,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QDeclarativeEngine>
 #include "qmlapplicationviewer.h"
 
diff --git a/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.cpp
index 8ba6e88..6d37b0b 100644
--- a/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -15,7 +15,7 @@
 #include <QtDeclarative/QDeclarativeComponent>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeContext>
-#include <QtGui/QApplication>
+#include <QApplication>
 
 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
 
diff --git a/examples/scatterchart/main.cpp b/examples/scatterchart/main.cpp
index 02441be..e427442 100644
--- a/examples/scatterchart/main.cpp
+++ b/examples/scatterchart/main.cpp
@@ -18,7 +18,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QMainWindow>
 #include "chartview.h"
 
diff --git a/examples/scatterinteractions/main.cpp b/examples/scatterinteractions/main.cpp
index d035622..c6202ef 100644
--- a/examples/scatterinteractions/main.cpp
+++ b/examples/scatterinteractions/main.cpp
@@ -18,7 +18,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QMainWindow>
 #include "chartview.h"
 
diff --git a/examples/stackedbarchartdrilldown/main.cpp b/examples/stackedbarchartdrilldown/main.cpp
index 0496661..a957233 100644
--- a/examples/stackedbarchartdrilldown/main.cpp
+++ b/examples/stackedbarchartdrilldown/main.cpp
@@ -18,7 +18,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QMainWindow>
 #include <QChartView>
 #include <QBarSet>
diff --git a/tests/qmlchartaxis/main.cpp b/tests/qmlchartaxis/main.cpp
index da1873a..3af10b6 100644
--- a/tests/qmlchartaxis/main.cpp
+++ b/tests/qmlchartaxis/main.cpp
@@ -18,7 +18,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QDeclarativeEngine>
 #include "qmlapplicationviewer.h"
 
diff --git a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp
index 8ba6e88..6d37b0b 100644
--- a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -15,7 +15,7 @@
 #include <QtDeclarative/QDeclarativeComponent>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeContext>
-#include <QtGui/QApplication>
+#include <QApplication>
 
 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
 
diff --git a/tests/qmlchartproperties/main.cpp b/tests/qmlchartproperties/main.cpp
index 2689717..3737597 100644
--- a/tests/qmlchartproperties/main.cpp
+++ b/tests/qmlchartproperties/main.cpp
@@ -18,7 +18,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QDeclarativeEngine>
 #include "qmlapplicationviewer.h"
 
diff --git a/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.cpp b/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.cpp
index 8ba6e88..6d37b0b 100644
--- a/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -15,7 +15,7 @@
 #include <QtDeclarative/QDeclarativeComponent>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeContext>
-#include <QtGui/QApplication>
+#include <QApplication>
 
 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN