Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Change-Id: I6178a580b4c99aded1a69032a02169cff502b71d

1 files changed, 8 insertions, 15 deletions

diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri
index 20b46f0939..aafc50db9b 100644
--- a/src/qml/qml/qml.pri
+++ b/src/qml/qml/qml.pri
@@ -1,12 +1,9 @@
 SOURCES += \
     $$PWD/qqmlinstruction.cpp \
-    $$PWD/qquicklistmodel.cpp \
-    $$PWD/qquicklistmodelworkeragent.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,20 +49,16 @@ SOURCES += \
     $$PWD/qqmlfile.cpp \
     $$PWD/qqmlbundle.cpp \
     $$PWD/qqmlmemoryprofiler.cpp \
-    $$PWD/qqmlconnections.cpp \
-    $$PWD/qqmltimer.cpp \
-    $$PWD/qqmlbind.cpp
+    $$PWD/qqmlplatform.cpp \
+    $$PWD/qqmlbinding.cpp \
+    $$PWD/qqmlapplicationengine.cpp
 
 HEADERS += \
     $$PWD/qqmlglobal_p.h \
     $$PWD/qqmlinstruction_p.h \
-    $$PWD/qquicklistmodel_p.h\
-    $$PWD/qquicklistmodel_p_p.h\
-    $$PWD/qquicklistmodelworkeragent_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 \
@@ -111,7 +103,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 \
@@ -129,9 +120,11 @@ 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 \
+    $$PWD/qqmlapplicationengine_p.h \
+    $$PWD/qqmlapplicationengine.h
 
 
 include(parser/parser.pri)