Merge branch 'qtquick2' into v8

Conflicts:
	src/declarative/qml/qml.pri

diff --cc src/declarative/declarative.pro
Simple merge

diff --cc src/declarative/items/qsgcanvasitem.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativecompiler.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativeengine.cpp
index c0db982,906af83..8764ab9
--- 1/src/declarative/qml/qdeclarativeengine.cpp
--- 2/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@@ -355,8 -363,127 +356,9 @@@ QDeclarativeEnginePrivate::QDeclarative
          QDeclarativeUtilModule::defineModule();
          QDeclarativeEnginePrivate::defineModule();
          QSGItemsModule::defineModule();
+         QSGParticlesModule::defineModule();
          QDeclarativeValueTypeFactory::registerValueTypes();
      }
 -    globalClass = new QDeclarativeGlobalScriptClass(&scriptEngine);
 -}
 -
 -/*!
 -  \qmlmethod url Qt::resolvedUrl(url url)
 -  Returns \a url resolved relative to the URL of the caller.
 -*/
 -QUrl QDeclarativeScriptEngine::resolvedUrl(QScriptContext *context, const QUrl& url)
 -{
 -    if (p) {
 -        QDeclarativeContextData *ctxt = p->getContext(context);
 -        if (ctxt)
 -            return ctxt->resolvedUrl(url);
 -        else
 -            return p->getUrl(context).resolved(url);
 -    }
 -    return baseUrl.resolved(url);
 -}
 -
 -QDeclarativeScriptEngine::QDeclarativeScriptEngine(QDeclarativeEnginePrivate *priv)
 -: p(priv), sqlQueryClass(0), namedNodeMapClass(0), nodeListClass(0)
 -{
 -    // Note that all documentation for stuff put on the global object goes in
 -    // doc/src/declarative/globalobject.qdoc
 -
 -    bool mainthread = priv != 0;
 -
 -    QScriptValue qtObject =
 -        newQMetaObject(StaticQtMetaObject::get());
 -    globalObject().setProperty(QLatin1String("Qt"), qtObject);
 -
 -#ifndef QT_NO_DESKTOPSERVICES
 -    offlineStoragePath = QDesktopServices::storageLocation(QDesktopServices::DataLocation).replace(QLatin1Char('/'), QDir::separator())
 -        + QDir::separator() + QLatin1String("QML")
 -        + QDir::separator() + QLatin1String("OfflineStorage");
 -#endif
 -
 -#ifndef QT_NO_XMLSTREAMREADER
 -    qt_add_qmlxmlhttprequest(this);
 -#endif
 -    qt_add_qmlsqldatabase(this);
 -    // XXX A Multimedia "Qt.Sound" class also needs to be made available,
 -    // XXX but we don't want a dependency in that cirection.
 -    // XXX When the above a done some better way, that way should also be
 -    // XXX used to add Qt.Sound class.
 -
 -    //types
 -    if (mainthread)
 -        qtObject.setProperty(QLatin1String("include"), newFunction(QDeclarativeInclude::include, 2));
 -    else
 -        qtObject.setProperty(QLatin1String("include"), newFunction(QDeclarativeInclude::worker_include, 2));
 -
 -    qtObject.setProperty(QLatin1String("isQtObject"), newFunction(QDeclarativeEnginePrivate::isQtObject, 1));
 -    qtObject.setProperty(QLatin1String("rgba"), newFunction(QDeclarativeEnginePrivate::rgba, 4));
 -    qtObject.setProperty(QLatin1String("hsla"), newFunction(QDeclarativeEnginePrivate::hsla, 4));
 -    qtObject.setProperty(QLatin1String("rect"), newFunction(QDeclarativeEnginePrivate::rect, 4));
 -    qtObject.setProperty(QLatin1String("point"), newFunction(QDeclarativeEnginePrivate::point, 2));
 -    qtObject.setProperty(QLatin1String("size"), newFunction(QDeclarativeEnginePrivate::size, 2));
 -    qtObject.setProperty(QLatin1String("vector3d"), newFunction(QDeclarativeEnginePrivate::vector3d, 3));
 -
 -    if (mainthread) {
 -        //color helpers
 -        qtObject.setProperty(QLatin1String("lighter"), newFunction(QDeclarativeEnginePrivate::lighter, 1));
 -        qtObject.setProperty(QLatin1String("darker"), newFunction(QDeclarativeEnginePrivate::darker, 1));
 -        qtObject.setProperty(QLatin1String("tint"), newFunction(QDeclarativeEnginePrivate::tint, 2));
 -    }
 -
 -#ifndef QT_NO_DATESTRING
 -    //date/time formatting
 -    qtObject.setProperty(QLatin1String("formatDate"),newFunction(QDeclarativeEnginePrivate::formatDate, 2));
 -    qtObject.setProperty(QLatin1String("formatTime"),newFunction(QDeclarativeEnginePrivate::formatTime, 2));
 -    qtObject.setProperty(QLatin1String("formatDateTime"),newFunction(QDeclarativeEnginePrivate::formatDateTime, 2));
 -#endif
 -
 -    //misc methods
 -    qtObject.setProperty(QLatin1String("openUrlExternally"),newFunction(QDeclarativeEnginePrivate::desktopOpenUrl, 1));
 -    qtObject.setProperty(QLatin1String("fontFamilies"),newFunction(QDeclarativeEnginePrivate::fontFamilies, 0));
 -    qtObject.setProperty(QLatin1String("md5"),newFunction(QDeclarativeEnginePrivate::md5, 1));
 -    qtObject.setProperty(QLatin1String("btoa"),newFunction(QDeclarativeEnginePrivate::btoa, 1));
 -    qtObject.setProperty(QLatin1String("atob"),newFunction(QDeclarativeEnginePrivate::atob, 1));
 -    qtObject.setProperty(QLatin1String("quit"), newFunction(QDeclarativeEnginePrivate::quit, 0));
 -    qtObject.setProperty(QLatin1String("resolvedUrl"),newFunction(QDeclarativeScriptEngine::resolvedUrl, 1));
 -
 -    if (mainthread) {
 -        qtObject.setProperty(QLatin1String("createQmlObject"),
 -                newFunction(QDeclarativeEnginePrivate::createQmlObject, 1));
 -        qtObject.setProperty(QLatin1String("createComponent"),
 -                newFunction(QDeclarativeEnginePrivate::createComponent, 1));
 -    }
 -
 -    //firebug/webkit compat
 -    QScriptValue consoleObject = newObject();
 -    consoleObject.setProperty(QLatin1String("log"),newFunction(QDeclarativeEnginePrivate::consoleLog, 1));
 -    consoleObject.setProperty(QLatin1String("debug"),newFunction(QDeclarativeEnginePrivate::consoleLog, 1));
 -    globalObject().setProperty(QLatin1String("console"), consoleObject);
 -
 -    // translation functions need to be installed
 -    // before the global script class is constructed (QTBUG-6437)
 -    installTranslatorFunctions();
 -}
 -
 -QDeclarativeScriptEngine::~QDeclarativeScriptEngine()
 -{
 -    delete sqlQueryClass;
 -    delete nodeListClass;
 -    delete namedNodeMapClass;
 -}
 -
 -QScriptValue QDeclarativeScriptEngine::resolvedUrl(QScriptContext *ctxt, QScriptEngine *engine)
 -{
 -    QString arg = ctxt->argument(0).toString();
 -    QUrl r = QDeclarativeScriptEngine::get(engine)->resolvedUrl(ctxt,QUrl(arg));
 -    return QScriptValue(r.toString());
 -}
 -
 -QNetworkAccessManager *QDeclarativeScriptEngine::networkAccessManager()
 -{
 -    return p->getNetworkAccessManager();
  }
  
  QDeclarativeEnginePrivate::~QDeclarativeEnginePrivate()

diff --cc src/declarative/qml/qdeclarativeexpression.cpp
index 095d9be,8079cf3..7d2803f
--- 1/src/declarative/qml/qdeclarativeexpression.cpp
--- 2/src/declarative/qml/qdeclarativeexpression.cpp
+++ b/src/declarative/qml/qdeclarativeexpression.cpp
@@@ -45,9 -45,14 +45,10 @@@
  #include "private/qdeclarativeengine_p.h"
  #include "private/qdeclarativecontext_p.h"
  #include "private/qdeclarativerewrite_p.h"
+ #include "private/qdeclarativescriptstring_p.h"
  #include "private/qdeclarativecompiler_p.h"
 -#include "private/qdeclarativeglobalscriptclass_p.h"
  
  #include <QtCore/qdebug.h>
 -#include <QtScript/qscriptprogram.h>
 -
 -#include <private/qscriptdeclarativeclass_p.h>
  
  QT_BEGIN_NAMESPACE
  

diff --cc src/declarative/qml/qdeclarativeexpression.h
Simple merge

diff --cc src/declarative/qml/qdeclarativevme.cpp
index 146c856,a9b303c..9082ef0
--- 1/src/declarative/qml/qdeclarativevme.cpp
--- 2/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@@ -59,7 -59,9 +59,8 @@@
  #include "private/qdeclarativecontext_p.h"
  #include "private/qdeclarativev4bindings_p.h"
  #include "private/qdeclarativeglobal_p.h"
 -#include "private/qdeclarativeglobalscriptclass_p.h"
  #include "qdeclarativescriptstring.h"
+ #include "qdeclarativescriptstring_p.h"
  
  #include <QStack>
  #include <QWidget>

diff --cc src/declarative/qml/qml.pri
index cc2f362,a69d52c..7325cd8
--- 1/src/declarative/qml/qml.pri
--- 2/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@@ -118,7 -135,3 +119,4 @@@ QT += sq
  include(parser/parser.pri)
  include(rewriter/rewriter.pri)
  include(v4/v4.pri)
- 
- # mirrors logic in corelib/kernel/kernel.pri
- unix:!symbian: contains(QT_CONFIG, clock-gettime):include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri)
 +include(v8/v8.pri)