Merge branch 'master' into refactor

Conflicts:
	src/3rdparty/v8
	src/declarative/declarative.pro
	src/declarative/items/qsgcanvas.cpp
	src/declarative/items/qsgshadereffectsource_p.h
	src/declarative/items/qsgview.cpp
	src/declarative/particles/qsgcustomparticle.cpp
	src/imports/gestures/gestures.pro
	src/imports/particles/particles.pro
	src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
	src/qtquick1/qtquick1.pro
	tests/auto/declarative/examples/examples.pro
	tests/auto/declarative/qsglistview/qsglistview.pro
	tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro

Change-Id: I423344f83e1835116cad531b877fde6e68a8849a

6 files changed, 15 insertions, 13 deletions

diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp
index b32898fe38..c719067e2e 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp
@@ -3665,8 +3665,8 @@ void QDeclarativeItem::setSize(const QSizeF &size)
 bool QDeclarativeItem::hasActiveFocus() const
 {
     Q_D(const QDeclarativeItem);
-    return focusItem() == this ||
-           (d->flags & QGraphicsItem::ItemIsFocusScope && focusItem() != 0);
+    return (focusItem() && focusItem()->isVisible()) && (focusItem() == this ||
+           (d->flags & QGraphicsItem::ItemIsFocusScope && focusItem() != 0));
 }
 
 /*!
diff --git a/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel.cpp
index 5d8a3d4b37..f76a4d9f08 100644
--- a/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -1379,7 +1379,7 @@ void QDeclarative1VisualDataModel::_q_rowsMoved(const QModelIndex &sourceParent,
     Q_D(QDeclarative1VisualDataModel);
     const int count = sourceEnd - sourceStart + 1;
     if (destinationParent == d->m_root && sourceParent == d->m_root) {
-        _q_itemsMoved(sourceStart, sourceStart > destinationRow ? destinationRow : destinationRow-1, count);
+        _q_itemsMoved(sourceStart, sourceStart > destinationRow ? destinationRow : destinationRow-count, count);
     } else if (sourceParent == d->m_root) {
         _q_itemsRemoved(sourceStart, count);
     } else if (destinationParent == d->m_root) {
diff --git a/src/qtquick1/qtquick1.pro b/src/qtquick1/qtquick1.pro
index 2e3113e214..66f2c848f2 100644
--- a/src/qtquick1/qtquick1.pro
+++ b/src/qtquick1/qtquick1.pro
@@ -7,7 +7,8 @@ CONFIG += module
 CONFIG += dll warn_on
 MODULE_PRI += ../../modules/qt_qtquick1.pri
 
-QT += testlib-private declarative testlib declarative-private core-private gui-private network widgets-private
+QT += testlib-private declarative testlib declarative-private core-private gui-private network widgets-private v8-private
+DEFINES += QT_NO_URL_CAST_FROM_STRING
 
 load(qt_module_config)
 
diff --git a/src/qtquick1/util/qdeclarativeconnections.cpp b/src/qtquick1/util/qdeclarativeconnections.cpp
index 5fc019c4c1..54f51acd12 100644
--- a/src/qtquick1/util/qdeclarativeconnections.cpp
+++ b/src/qtquick1/util/qdeclarativeconnections.cpp
@@ -223,7 +223,7 @@ QDeclarative1ConnectionsParser::compile(const QList<QDeclarativeCustomParserProp
                 error(props.at(ii), QDeclarative1Connections::tr("Connections: syntax error"));
                 return QByteArray();
             } else {
-                QDeclarativeParser::Variant v = qvariant_cast<QDeclarativeParser::Variant>(value);
+                QDeclarativeScript::Variant v = qvariant_cast<QDeclarativeScript::Variant>(value);
                 if (v.isScript()) {
                     ds << propName;
                     ds << v.asScript();
diff --git a/src/qtquick1/util/qdeclarativelistmodel.cpp b/src/qtquick1/util/qdeclarativelistmodel.cpp
index d5aa75bec5..5c31a8bd79 100644
--- a/src/qtquick1/util/qdeclarativelistmodel.cpp
+++ b/src/qtquick1/util/qdeclarativelistmodel.cpp
@@ -44,7 +44,7 @@
 #include "QtQuick1/private/qdeclarativeopenmetaobject_p.h"
 
 #include <QtDeclarative/private/qdeclarativecustomparser_p.h>
-#include <QtDeclarative/private/qdeclarativeparser_p.h>
+#include <QtDeclarative/private/qdeclarativescript_p.h>
 #include <QtDeclarative/private/qdeclarativeengine_p.h>
 #include <QtDeclarative/qdeclarativecontext.h>
 #include <QtDeclarative/qdeclarativeinfo.h>
@@ -787,6 +787,7 @@ void QDeclarative1ListModelParser::setCustomData(QObject *obj, const QByteArray
     QDeclarative1ListModel *rv = static_cast<QDeclarative1ListModel *>(obj);
 
     ModelNode *root = new ModelNode(rv->m_nested);
+    rv->m_nested->m_ownsRoot = true;
     rv->m_nested->_root = root;
     QStack<ModelNode *> nodes;
     nodes << root;
diff --git a/src/qtquick1/util/qdeclarativepropertychanges.cpp b/src/qtquick1/util/qdeclarativepropertychanges.cpp
index 776701e58f..fc063cafb0 100644
--- a/src/qtquick1/util/qdeclarativepropertychanges.cpp
+++ b/src/qtquick1/util/qdeclarativepropertychanges.cpp
@@ -48,7 +48,7 @@
 
 #include <QtDeclarative/qdeclarativeinfo.h>
 #include <QtDeclarative/private/qdeclarativecustomparser_p.h>
-#include <QtDeclarative/private/qdeclarativeparser_p.h>
+#include <QtDeclarative/private/qdeclarativescript_p.h>
 #include <QtDeclarative/qdeclarativeexpression.h>
 #include <QtDeclarative/private/qdeclarativebinding_p.h>
 #include <QtDeclarative/qdeclarativecontext.h>
@@ -282,22 +282,22 @@ QDeclarative1PropertyChangesParser::compile(const QList<QDeclarativeCustomParser
 
     ds << data.count();
     for(int ii = 0; ii < data.count(); ++ii) {
-        QDeclarativeParser::Variant v = qvariant_cast<QDeclarativeParser::Variant>(data.at(ii).second);
+        QDeclarativeScript::Variant v = qvariant_cast<QDeclarativeScript::Variant>(data.at(ii).second);
         QVariant var;
         bool isScript = v.isScript();
         QDeclarativeBinding::Identifier id = 0;
         switch(v.type()) {
-        case QDeclarativeParser::Variant::Boolean:
+        case QDeclarativeScript::Variant::Boolean:
             var = QVariant(v.asBoolean());
             break;
-        case QDeclarativeParser::Variant::Number:
+        case QDeclarativeScript::Variant::Number:
             var = QVariant(v.asNumber());
             break;
-        case QDeclarativeParser::Variant::String:
+        case QDeclarativeScript::Variant::String:
             var = QVariant(v.asString());
             break;
-        case QDeclarativeParser::Variant::Invalid:
-        case QDeclarativeParser::Variant::Script:
+        case QDeclarativeScript::Variant::Invalid:
+        case QDeclarativeScript::Variant::Script:
             var = QVariant(v.asScript());
             {
                 // Pre-rewrite the expression