Re-order some includes

The semi-private headers of QML-exposed types should follow our
conventions regarding include formatting.

Change-Id: I224603d37ea5debcfad258b1e14907b40328c8f6
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

10 files changed, 33 insertions, 19 deletions

diff --git a/src/qml/types/qqmlbind_p.h b/src/qml/types/qqmlbind_p.h
index 25c185fee3..0687fa0fb1 100644
--- a/src/qml/types/qqmlbind_p.h
+++ b/src/qml/types/qqmlbind_p.h
@@ -52,8 +52,8 @@
 //
 
 #include <private/qtqmlglobal_p.h>
-#include <qqml.h>
 
+#include <QtQml/qqml.h>
 #include <QtCore/qobject.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick/items/qquickdroparea_p.h b/src/quick/items/qquickdroparea_p.h
index 74f16df9cc..ece9f361e7 100644
--- a/src/quick/items/qquickdroparea_p.h
+++ b/src/quick/items/qquickdroparea_p.h
@@ -52,7 +52,8 @@
 //
 
 #include <private/qtquickglobal_p.h>
-#include "qquickitem.h"
+
+#include <QtQuick/qquickitem.h>
 
 #include <QtGui/qevent.h>
 
diff --git a/src/quick/items/qquickfocusscope_p.h b/src/quick/items/qquickfocusscope_p.h
index b8c69a2419..6c241011b6 100644
--- a/src/quick/items/qquickfocusscope_p.h
+++ b/src/quick/items/qquickfocusscope_p.h
@@ -52,7 +52,8 @@
 //
 
 #include <private/qtquickglobal_p.h>
-#include "qquickitem.h"
+
+#include <QtQuick/qquickitem.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h
index 66626e8610..e38bea87e7 100644
--- a/src/quick/items/qquickmultipointtoucharea_p.h
+++ b/src/quick/items/qquickmultipointtoucharea_p.h
@@ -52,15 +52,17 @@
 //
 
 #include <private/qtquickglobal_p.h>
-#include "qquickitem.h"
-#include "qevent.h"
 
-#include <QPointer>
-#include <QMap>
-#include <QList>
+#include <QtQuick/qquickitem.h>
+
+#include <QtGui/qevent.h>
 #include <QtGui/qguiapplication.h>
 #include <QtGui/qstylehints.h>
 
+#include <QtCore/qlist.h>
+#include <QtCore/qmap.h>
+#include <QtCore/qpointer.h>
+
 QT_BEGIN_NAMESPACE
 
 class QQuickMultiPointTouchArea;
diff --git a/src/quick/items/qquicktranslate_p.h b/src/quick/items/qquicktranslate_p.h
index 1853f2f9c6..2050e6a62a 100644
--- a/src/quick/items/qquicktranslate_p.h
+++ b/src/quick/items/qquicktranslate_p.h
@@ -52,7 +52,8 @@
 //
 
 #include <private/qtquickglobal_p.h>
-#include "qquickitem.h"
+
+#include <QtQuick/qquickitem.h>
 
 #include <QtGui/qmatrix4x4.h>
 
diff --git a/src/quick/util/qquickfontloader_p.h b/src/quick/util/qquickfontloader_p.h
index 3f88ef21ad..23cdaa770a 100644
--- a/src/quick/util/qquickfontloader_p.h
+++ b/src/quick/util/qquickfontloader_p.h
@@ -52,7 +52,8 @@
 //
 
 #include <private/qtquickglobal_p.h>
-#include <qqml.h>
+
+#include <QtQml/qqml.h>
 
 #include <QtCore/qobject.h>
 #include <QtCore/qurl.h>
diff --git a/src/quick/util/qquickfontmetrics_p.h b/src/quick/util/qquickfontmetrics_p.h
index 9784af3245..a1b4e29677 100644
--- a/src/quick/util/qquickfontmetrics_p.h
+++ b/src/quick/util/qquickfontmetrics_p.h
@@ -52,10 +52,12 @@
 //
 
 #include <private/qtquickglobal_p.h>
-#include <qqml.h>
 
-#include <QtGui/QFontMetricsF>
-#include <QtCore/QObject>
+#include <QtQml/qqml.h>
+
+#include <QtGui/qfontmetrics.h>
+
+#include <QtCore/qobject.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick/util/qquicksystempalette_p.h b/src/quick/util/qquicksystempalette_p.h
index f5040bcc74..58d77e136c 100644
--- a/src/quick/util/qquicksystempalette_p.h
+++ b/src/quick/util/qquicksystempalette_p.h
@@ -52,10 +52,12 @@
 //
 
 #include <private/qtquickglobal_p.h>
-#include <qqml.h>
 
 #include <QtCore/qobject.h>
-#include <QPalette>
+
+#include <QtGui/qpalette.h>
+
+#include <QtQml/qqml.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick/util/qquicktextmetrics_p.h b/src/quick/util/qquicktextmetrics_p.h
index 4306da7258..7273475ee9 100644
--- a/src/quick/util/qquicktextmetrics_p.h
+++ b/src/quick/util/qquicktextmetrics_p.h
@@ -52,10 +52,12 @@
 //
 
 #include <private/qtquickglobal_p.h>
-#include <qqml.h>
 
-#include <QtGui/QFontMetricsF>
-#include <QtCore/QObject>
+#include <QtCore/qobject.h>
+
+#include <QtGui/qfontmetrics.h>
+
+#include <QtQml/qqml.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick/util/qquickvalidator_p.h b/src/quick/util/qquickvalidator_p.h
index 8347a4a32b..9b8945424c 100644
--- a/src/quick/util/qquickvalidator_p.h
+++ b/src/quick/util/qquickvalidator_p.h
@@ -52,9 +52,11 @@
 //
 
 #include <private/qtquickglobal_p.h>
-#include <QtGui/qvalidator.h>
+
 #include <QtQml/qqml.h>
 
+#include <QtGui/qvalidator.h>
+
 QT_BEGIN_NAMESPACE
 
 #if QT_CONFIG(validator)