From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Wed, 22 Jun 2011 06:13:23 +0000 (+1000)
Subject: Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into v8
X-Git-Tag: qt-v5.0.0-alpha1~2144^2~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=430ec8741e6c42a9f618b7d5246838bd50edd292;p=profile%2Fivi%2Fqtdeclarative.git

Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into v8

Conflicts:
	src/declarative/items/qsgcontext2d.cpp
	src/declarative/qml/qdeclarativexmlhttprequest.cpp
	tests/auto/declarative/declarative.pro
	tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
---

430ec8741e6c42a9f618b7d5246838bd50edd292
diff --cc src/declarative/qml/qdeclarativexmlhttprequest.cpp
index 64719d5,f74995b..33875fe
--- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp
+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
@@@ -1525,18 -1449,22 +1527,19 @@@ static v8::Handle<v8::Value> qmlxmlhttp
      if (method != QLatin1String("GET") && 
          method != QLatin1String("PUT") &&
          method != QLatin1String("HEAD") &&
-         method != QLatin1String("POST"))
+         method != QLatin1String("POST") &&
+         method != QLatin1String("DELETE"))
 -        THROW_DOM(SYNTAX_ERR, "Unsupported HTTP method type");
 -
 +        V8THROW_DOM(SYNTAX_ERR, "Unsupported HTTP method type");
  
      // Argument 1 - URL
 -    QUrl url = QUrl::fromEncoded(context->argument(1).toString().toUtf8());
 +    QUrl url = QUrl::fromEncoded(engine->toString(args[1]).toUtf8());
  
 -    if (url.isRelative()) {
 -        url = QDeclarativeScriptEngine::get(engine)->resolvedUrl(context,url);
 -    }
 +    if (url.isRelative()) 
 +        url = engine->callingContext()->resolvedUrl(url);
  
      // Argument 2 - async (optional)
 -    if (context->argumentCount() > 2 && !context->argument(2).toBoolean())
 -        THROW_DOM(NOT_SUPPORTED_ERR, "Synchronous XMLHttpRequest calls are not supported");
 -
 +    if (args.Length() > 2 && !args[2]->BooleanValue())
 +        V8THROW_DOM(NOT_SUPPORTED_ERR, "Synchronous XMLHttpRequest calls are not supported");
  
      // Argument 3/4 - user/pass (optional)
      QString username, password;