From 084487ee1f296b806c946a9cf92d184d54ff5d54 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sat, 17 Dec 2011 08:44:21 +0100 Subject: 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 --- examples/embedded/qmlcalculator/qmlcalculator.cpp | 2 +- examples/embedded/qmlclocks/qmlclocks.cpp | 2 +- examples/embedded/qmldialcontrol/qmldialcontrol.cpp | 2 +- examples/embedded/qmleasing/qmleasing.cpp | 2 +- examples/embedded/qmlflickr/qmlflickr.cpp | 2 +- examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp | 2 +- examples/embedded/qmltwitter/qmltwitter.cpp | 2 +- src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h | 2 +- tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp | 2 +- tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp | 2 +- tests/auto/qtquick2/qquickgridview/tst_qquickgridview.cpp | 2 +- tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp | 2 +- 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 -#include +#include #include #include 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 -#include +#include #include #include 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 -#include +#include #include #include 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 -#include +#include #include #include 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 #include -#include +#include #include #include #include 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 #include -#include +#include #include #include #include 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 #include -#include +#include #include #include #include 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 +#include #include 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 -#include +#include #include #include #include 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 -#include +#include #include #include #include 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 -#include +#include #include #include #include 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 -#include +#include #include #include #include -- cgit v1.2.3