Move QML types to types folder

The QtQml module has gain a bunch of QML types cluttering up the qml
folder. Moving them to types organizes them a bit better.

Change-Id: I570884c00f4abc48f4f1aea048bf002bc70223f3
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

27 files changed, 36 insertions, 35 deletions

diff --git a/src/qml/items/items.pri b/src/qml/items/items.pri
deleted file mode 100644
index f5224f0acc..0000000000
--- a/src/qml/items/items.pri
+++ /dev/null
@@ -1,12 +0,0 @@
-SOURCES += \
-    $$PWD/qquickpackage.cpp \
-    $$PWD/qqmldelegatemodel.cpp \
-    $$PWD/qqmlobjectmodel.cpp \
-    $$PWD/qqmlmodelsmodule.cpp
-
-HEADERS += \
-    $$PWD/qquickpackage_p.h \
-    $$PWD/qqmldelegatemodel_p.h \
-    $$PWD/qqmldelegatemodel_p_p.h \
-    $$PWD/qqmlobjectmodel_p.h \
-    $$PWD/qqmlmodelsmodule_p.h
diff --git a/src/qml/qml.pro b/src/qml/qml.pro
index 08aa369ac3..8dbe0c65d1 100644
--- a/src/qml/qml.pro
+++ b/src/qml/qml.pro
@@ -25,4 +25,4 @@ include(util/util.pri)
 include(qml/qml.pri)
 include(debugger/debugger.pri)
 include(animations/animations.pri)
-include(items/items.pri)
+include(types/types.pri)
diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri
index d3abd84fc8..a660abe7d7 100644
--- a/src/qml/qml/qml.pri
+++ b/src/qml/qml/qml.pri
@@ -1,12 +1,9 @@
 SOURCES += \
     $$PWD/qqmlinstruction.cpp \
-    $$PWD/qqmllistmodel.cpp \
-    $$PWD/qqmllistmodelworkeragent.cpp \
     $$PWD/qqmlopenmetaobject.cpp \
     $$PWD/qqmlvmemetaobject.cpp \
     $$PWD/qqmlengine.cpp \
     $$PWD/qqmlexpression.cpp \
-    $$PWD/qqmlbinding.cpp \
     $$PWD/qqmlproperty.cpp \
     $$PWD/qqmlcomponent.cpp \
     $$PWD/qqmlincubator.cpp \
@@ -38,7 +35,6 @@ SOURCES += \
     $$PWD/qqmltypenotavailable.cpp \
     $$PWD/qqmltypenamecache.cpp \
     $$PWD/qqmlscriptstring.cpp \
-    $$PWD/qquickworkerscript.cpp \
     $$PWD/qqmlnetworkaccessmanagerfactory.cpp \
     $$PWD/qqmldirparser.cpp \
     $$PWD/qqmlextensionplugin.cpp \
@@ -53,21 +49,15 @@ SOURCES += \
     $$PWD/qqmlfile.cpp \
     $$PWD/qqmlbundle.cpp \
     $$PWD/qqmlmemoryprofiler.cpp \
-    $$PWD/qqmlconnections.cpp \
-    $$PWD/qqmltimer.cpp \
-    $$PWD/qqmlbind.cpp \
-    $$PWD/qqmlplatform.cpp
+    $$PWD/qqmlplatform.cpp \
+    $$PWD/qqmlbinding.cpp
 
 HEADERS += \
     $$PWD/qqmlglobal_p.h \
     $$PWD/qqmlinstruction_p.h \
-    $$PWD/qqmllistmodel_p.h\
-    $$PWD/qqmllistmodel_p_p.h\
-    $$PWD/qqmllistmodelworkeragent_p.h \
     $$PWD/qqmlopenmetaobject_p.h \
     $$PWD/qqmlvmemetaobject_p.h \
     $$PWD/qqml.h \
-    $$PWD/qqmlbinding_p.h \
     $$PWD/qqmlproperty.h \
     $$PWD/qqmlcomponent.h \
     $$PWD/qqmlcomponent_p.h \
@@ -112,7 +102,6 @@ HEADERS += \
     $$PWD/qqmltypenotavailable_p.h \
     $$PWD/qqmltypenamecache_p.h \
     $$PWD/qqmlscriptstring.h \
-    $$PWD/qquickworkerscript_p.h \
     $$PWD/qqmlguard_p.h \
     $$PWD/qqmlnetworkaccessmanagerfactory.h \
     $$PWD/qqmldirparser_p.h \
@@ -130,10 +119,8 @@ HEADERS += \
     $$PWD/qqmlfile.h \
     $$PWD/qqmlbundle_p.h \
     $$PWD/qqmlmemoryprofiler_p.h \
-    $$PWD/qqmlconnections_p.h \
-    $$PWD/qqmltimer_p.h \
-    $$PWD/qqmlbind_p.h \
     $$PWD/qqmlplatform_p.h \
+    $$PWD/qqmlbinding_p.h \
     $$PWD/qqmlextensionplugin_p.h
 
 
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 5bb9ac7df6..23d1cf785e 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -55,7 +55,6 @@
 #include "qqmlxmlhttprequest_p.h"
 #include "qqmlscriptstring.h"
 #include "qqmlglobal_p.h"
-#include "qquickworkerscript_p.h"
 #include "qqmlcomponent_p.h"
 #include "qqmlnetworkaccessmanagerfactory.h"
 #include "qqmldirparser_p.h"
@@ -96,6 +95,7 @@
 #include <private/qquickpackage_p.h>
 #include <private/qqmldelegatemodel_p.h>
 #include <private/qqmlobjectmodel_p.h>
+#include <private/qquickworkerscript_p.h>
 
 #ifdef Q_OS_WIN // for %APPDATA%
 #include <qt_windows.h>
diff --git a/src/qml/qml/qqmlbind.cpp b/src/qml/types/qqmlbind.cpp
index fcb3079891..fcb3079891 100644
--- a/src/qml/qml/qqmlbind.cpp
+++ b/src/qml/types/qqmlbind.cpp
diff --git a/src/qml/qml/qqmlbind_p.h b/src/qml/types/qqmlbind_p.h
index 1e29c257f0..1e29c257f0 100644
--- a/src/qml/qml/qqmlbind_p.h
+++ b/src/qml/types/qqmlbind_p.h
diff --git a/src/qml/qml/qqmlconnections.cpp b/src/qml/types/qqmlconnections.cpp
index 286933e557..286933e557 100644
--- a/src/qml/qml/qqmlconnections.cpp
+++ b/src/qml/types/qqmlconnections.cpp
diff --git a/src/qml/qml/qqmlconnections_p.h b/src/qml/types/qqmlconnections_p.h
index 9bc668e5f4..9bc668e5f4 100644
--- a/src/qml/qml/qqmlconnections_p.h
+++ b/src/qml/types/qqmlconnections_p.h
diff --git a/src/qml/items/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
index efbd98bdbc..efbd98bdbc 100644
--- a/src/qml/items/qqmldelegatemodel.cpp
+++ b/src/qml/types/qqmldelegatemodel.cpp
diff --git a/src/qml/items/qqmldelegatemodel_p.h b/src/qml/types/qqmldelegatemodel_p.h
index 5702c59787..5702c59787 100644
--- a/src/qml/items/qqmldelegatemodel_p.h
+++ b/src/qml/types/qqmldelegatemodel_p.h
diff --git a/src/qml/items/qqmldelegatemodel_p_p.h b/src/qml/types/qqmldelegatemodel_p_p.h
index 68242f433d..68242f433d 100644
--- a/src/qml/items/qqmldelegatemodel_p_p.h
+++ b/src/qml/types/qqmldelegatemodel_p_p.h
diff --git a/src/qml/qml/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp
index 254eb58962..9609e91b1c 100644
--- a/src/qml/qml/qqmllistmodel.cpp
+++ b/src/qml/types/qqmllistmodel.cpp
@@ -41,7 +41,7 @@
 
 #include "qqmllistmodel_p_p.h"
 #include "qqmllistmodelworkeragent_p.h"
-#include "qqmlopenmetaobject_p.h"
+#include <private/qqmlopenmetaobject_p.h>
 #include <private/qqmljsast_p.h>
 #include <private/qqmljsengine_p.h>
 
diff --git a/src/qml/qml/qqmllistmodel_p.h b/src/qml/types/qqmllistmodel_p.h
index 70477115bd..70477115bd 100644
--- a/src/qml/qml/qqmllistmodel_p.h
+++ b/src/qml/types/qqmllistmodel_p.h
diff --git a/src/qml/qml/qqmllistmodel_p_p.h b/src/qml/types/qqmllistmodel_p_p.h
index f2720c6c39..0190081320 100644
--- a/src/qml/qml/qqmllistmodel_p_p.h
+++ b/src/qml/types/qqmllistmodel_p_p.h
@@ -55,7 +55,7 @@
 
 #include "qqmllistmodel_p.h"
 #include <private/qqmlengine_p.h>
-#include "qqmlopenmetaobject_p.h"
+#include <private/qqmlopenmetaobject_p.h>
 #include <qqml.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qml/qml/qqmllistmodelworkeragent.cpp b/src/qml/types/qqmllistmodelworkeragent.cpp
index 9554e6d1e5..9554e6d1e5 100644
--- a/src/qml/qml/qqmllistmodelworkeragent.cpp
+++ b/src/qml/types/qqmllistmodelworkeragent.cpp
diff --git a/src/qml/qml/qqmllistmodelworkeragent_p.h b/src/qml/types/qqmllistmodelworkeragent_p.h
index 614017069c..614017069c 100644
--- a/src/qml/qml/qqmllistmodelworkeragent_p.h
+++ b/src/qml/types/qqmllistmodelworkeragent_p.h
diff --git a/src/qml/items/qqmlmodelsmodule.cpp b/src/qml/types/qqmlmodelsmodule.cpp
index 4f6b0a5580..4f6b0a5580 100644
--- a/src/qml/items/qqmlmodelsmodule.cpp
+++ b/src/qml/types/qqmlmodelsmodule.cpp
diff --git a/src/qml/items/qqmlmodelsmodule_p.h b/src/qml/types/qqmlmodelsmodule_p.h
index 6e72dadf8b..6e72dadf8b 100644
--- a/src/qml/items/qqmlmodelsmodule_p.h
+++ b/src/qml/types/qqmlmodelsmodule_p.h
diff --git a/src/qml/items/qqmlobjectmodel.cpp b/src/qml/types/qqmlobjectmodel.cpp
index 7f7bf92fa3..7f7bf92fa3 100644
--- a/src/qml/items/qqmlobjectmodel.cpp
+++ b/src/qml/types/qqmlobjectmodel.cpp
diff --git a/src/qml/items/qqmlobjectmodel_p.h b/src/qml/types/qqmlobjectmodel_p.h
index 59a4a551a7..59a4a551a7 100644
--- a/src/qml/items/qqmlobjectmodel_p.h
+++ b/src/qml/types/qqmlobjectmodel_p.h
diff --git a/src/qml/qml/qqmltimer.cpp b/src/qml/types/qqmltimer.cpp
index a1cb8532f7..a1cb8532f7 100644
--- a/src/qml/qml/qqmltimer.cpp
+++ b/src/qml/types/qqmltimer.cpp
diff --git a/src/qml/qml/qqmltimer_p.h b/src/qml/types/qqmltimer_p.h
index c625522851..c625522851 100644
--- a/src/qml/qml/qqmltimer_p.h
+++ b/src/qml/types/qqmltimer_p.h
diff --git a/src/qml/items/qquickpackage.cpp b/src/qml/types/qquickpackage.cpp
index e885524b27..e885524b27 100644
--- a/src/qml/items/qquickpackage.cpp
+++ b/src/qml/types/qquickpackage.cpp
diff --git a/src/qml/items/qquickpackage_p.h b/src/qml/types/qquickpackage_p.h
index 9427c886a8..9427c886a8 100644
--- a/src/qml/items/qquickpackage_p.h
+++ b/src/qml/types/qquickpackage_p.h
diff --git a/src/qml/qml/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp
index b9b027f6ad..ad09e1ec0c 100644
--- a/src/qml/qml/qquickworkerscript.cpp
+++ b/src/qml/types/qquickworkerscript.cpp
@@ -42,8 +42,8 @@
 #include "qquickworkerscript_p.h"
 #include "qqmllistmodel_p.h"
 #include "qqmllistmodelworkeragent_p.h"
-#include "qqmlengine_p.h"
-#include "qqmlexpression_p.h"
+#include <private/qqmlengine_p.h>
+#include <private/qqmlexpression_p.h>
 
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qcoreapplication.h>
diff --git a/src/qml/qml/qquickworkerscript_p.h b/src/qml/types/qquickworkerscript_p.h
index d568e58d0e..1ab5208e45 100644
--- a/src/qml/qml/qquickworkerscript_p.h
+++ b/src/qml/types/qquickworkerscript_p.h
@@ -54,8 +54,8 @@
 //
 
 #include "qqml.h"
-#include "qqmlparserstatus.h"
 
+#include <QtQml/qqmlparserstatus.h>
 #include <QtCore/qthread.h>
 #include <QtQml/qjsvalue.h>
 #include <QtCore/qurl.h>
diff --git a/src/qml/types/types.pri b/src/qml/types/types.pri
new file mode 100644
index 0000000000..22e62ea8de
--- /dev/null
+++ b/src/qml/types/types.pri
@@ -0,0 +1,26 @@
+SOURCES += \
+    $$PWD/qqmlbind.cpp \
+    $$PWD/qqmlconnections.cpp \
+    $$PWD/qqmldelegatemodel.cpp \
+    $$PWD/qqmllistmodel.cpp \
+    $$PWD/qqmllistmodelworkeragent.cpp \
+    $$PWD/qqmlmodelsmodule.cpp \
+    $$PWD/qqmlobjectmodel.cpp \
+    $$PWD/qqmltimer.cpp \
+    $$PWD/qquickpackage.cpp \
+    $$PWD/qquickworkerscript.cpp
+
+HEADERS += \
+    $$PWD/qqmlbind_p.h \
+    $$PWD/qqmlconnections_p.h \
+    $$PWD/qqmldelegatemodel_p.h \
+    $$PWD/qqmldelegatemodel_p_p.h \
+    $$PWD/qqmllistmodel_p.h \
+    $$PWD/qqmllistmodel_p_p.h \
+    $$PWD/qqmllistmodelworkeragent_p.h \
+    $$PWD/qqmlmodelsmodule_p.h \
+    $$PWD/qqmlobjectmodel_p.h \
+    $$PWD/qqmltimer_p.h \
+    $$PWD/qquickpackage_p.h \
+    $$PWD/qquickworkerscript_p.h
+