Merge branch 'master' into refactor

Conflicts:
	src/declarative/declarative.pro
	src/imports/gestures/gestures.pro
	src/imports/inputcontext/inputcontext.pro
	src/qtquick1/graphicsitems/qdeclarativeitem.cpp
	src/qtquick1/qtquick1.pro

Change-Id: I782be7090d8b6da9c890bc8e778722da93da8037

9 files changed, 10 insertions, 13 deletions

diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp
index a4654e4fe8..20b4c11f5b 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp
@@ -59,7 +59,7 @@
 #include <QEvent>
 #include <QGraphicsSceneMouseEvent>
 #include <QtCore/qnumeric.h>
-#include <QtScript/qscriptengine.h>
+#include <QtDeclarative/qjsengine.h>
 
 #include <private/qv8engine_p.h>
 #include <QtWidgets/qgraphicstransform.h>
@@ -2897,7 +2897,7 @@ QDeclarativeListProperty<QDeclarative1Transition> QDeclarativeItemPrivate::trans
 
   If clipping is enabled, an item will clip its own painting, as well
   as the painting of its children, to its bounding rectangle. If you set
-  clipping during an item's paint operation, remember to re-set it to 
+  clipping during an item's paint operation, remember to re-set it to
   prevent clipping the rest of your scene.
 
   Non-rectangular clipping regions are not supported for performance reasons.
diff --git a/src/qtquick1/qtquick1.pro b/src/qtquick1/qtquick1.pro
index e7db6062fb..2e3113e214 100644
--- a/src/qtquick1/qtquick1.pro
+++ b/src/qtquick1/qtquick1.pro
@@ -7,8 +7,7 @@ CONFIG += module
 CONFIG += dll warn_on
 MODULE_PRI += ../../modules/qt_qtquick1.pri
 
-QT += testlib-private declarative script testlib declarative-private core-private gui-private script-private network widgets-private
-DEFINES += QT_NO_URL_CAST_FROM_STRING
+QT += testlib-private declarative testlib declarative-private core-private gui-private network widgets-private
 
 load(qt_module_config)
 
diff --git a/src/qtquick1/util/qdeclarativeanimation.cpp b/src/qtquick1/util/qdeclarativeanimation.cpp
index 46c3f15a29..89b768b827 100644
--- a/src/qtquick1/util/qdeclarativeanimation.cpp
+++ b/src/qtquick1/util/qdeclarativeanimation.cpp
@@ -162,7 +162,7 @@ void QDeclarative1AbstractAnimationPrivate::commence()
     q->transition(actions, properties, QDeclarative1AbstractAnimation::Forward);
 
     q->qtAnimation()->start();
-    if (q->qtAnimation()->state() != QAbstractAnimation::Running) {
+    if (q->qtAnimation()->state() == QAbstractAnimation::Stopped) {
         running = false;
         emit q->completed();
     }
diff --git a/src/qtquick1/util/qdeclarativebind.cpp b/src/qtquick1/util/qdeclarativebind.cpp
index f6463be05d..50514234a3 100644
--- a/src/qtquick1/util/qdeclarativebind.cpp
+++ b/src/qtquick1/util/qdeclarativebind.cpp
@@ -49,9 +49,8 @@
 
 #include <QtCore/qfile.h>
 #include <QtCore/qdebug.h>
-#include <QtScript/qscriptvalue.h>
-#include <QtScript/qscriptcontext.h>
-#include <QtScript/qscriptengine.h>
+#include <QtDeclarative/qjsvalue.h>
+#include <QtDeclarative/qjsengine.h>
 
 #include <private/qobject_p.h>
 
diff --git a/src/qtquick1/util/qdeclarativelistmodel.cpp b/src/qtquick1/util/qdeclarativelistmodel.cpp
index 5d60ed9658..520d9ac388 100644
--- a/src/qtquick1/util/qdeclarativelistmodel.cpp
+++ b/src/qtquick1/util/qdeclarativelistmodel.cpp
@@ -52,7 +52,7 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qstack.h>
 #include <QXmlStreamReader>
-#include <QtScript/qscriptvalueiterator.h>
+#include <QtDeclarative/qscriptvalueiterator.h>
 
 Q_DECLARE_METATYPE(QListModelInterface *)
 
diff --git a/src/qtquick1/util/qdeclarativelistmodel_p.h b/src/qtquick1/util/qdeclarativelistmodel_p.h
index 21398f7213..1be5e6001a 100644
--- a/src/qtquick1/util/qdeclarativelistmodel_p.h
+++ b/src/qtquick1/util/qdeclarativelistmodel_p.h
@@ -51,7 +51,7 @@
 #include <QtCore/QList>
 #include <QtCore/QVariant>
 #include <QtQuick1/private/qlistmodelinterface_p.h>
-#include <QtScript/qscriptvalue.h>
+#include <QtDeclarative/qjsvalue.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/qtquick1/util/qdeclarativelistmodel_p_p.h b/src/qtquick1/util/qdeclarativelistmodel_p_p.h
index e34f6d850d..ee39ba45b1 100644
--- a/src/qtquick1/util/qdeclarativelistmodel_p_p.h
+++ b/src/qtquick1/util/qdeclarativelistmodel_p_p.h
@@ -58,7 +58,7 @@
 #include "QtQuick1/private/qdeclarativeopenmetaobject_p.h"
 #include <QtDeclarative/qdeclarative.h>
 
-#include <QtScript/private/qscriptdeclarativeclass_p.h>
+#include <QtDeclarative/private/qscriptdeclarativeclass_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/qtquick1/util/qdeclarativelistmodelworkeragent_p.h b/src/qtquick1/util/qdeclarativelistmodelworkeragent_p.h
index f0979c4b31..a769185607 100644
--- a/src/qtquick1/util/qdeclarativelistmodelworkeragent_p.h
+++ b/src/qtquick1/util/qdeclarativelistmodelworkeragent_p.h
@@ -55,7 +55,7 @@
 
 #include <QtDeclarative/qdeclarative.h>
 
-#include <QtScript/qscriptvalue.h>
+#include <QtDeclarative/qjsvalue.h>
 #include <QtGui/qevent.h>
 #include <QMutex>
 #include <QWaitCondition>
diff --git a/src/qtquick1/util/qdeclarativeview.cpp b/src/qtquick1/util/qdeclarativeview.cpp
index 5f0e53a482..fd5f9debf7 100644
--- a/src/qtquick1/util/qdeclarativeview.cpp
+++ b/src/qtquick1/util/qdeclarativeview.cpp
@@ -51,7 +51,6 @@
 #include <QtDeclarative/private/qdeclarativedebugtrace_p.h>
 #include <QtDeclarative/private/qdeclarativeinspectorservice_p.h>
 
-#include <qscriptvalueiterator.h>
 #include <qdebug.h>
 #include <qtimer.h>
 #include <qevent.h>