diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-22 16:13:23 +1000 |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-22 16:13:23 +1000 |
| commit | 430ec8741e6c42a9f618b7d5246838bd50edd292 (patch) | |
| tree | e2e16199bb116d936a86da40b3466b406f8027f0 /src/declarative/qml | |
| parent | f60a61157cb361e19c50eb53391f18b82990a026 (diff) | |
| parent | 6938289ce3e1e29cc81f0e007390e0b5f6ef1a43 (diff) | |
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
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qdeclarativexmlhttprequest.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp index 64719d59d6..33875fef88 100644 --- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp +++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp @@ -1203,10 +1203,12 @@ void QDeclarativeXMLHttpRequest::requestFromUrl(const QUrl &url) m_network = networkAccessManager()->get(request); else if (m_method == QLatin1String("HEAD")) m_network = networkAccessManager()->head(request); - else if(m_method == QLatin1String("POST")) + else if (m_method == QLatin1String("POST")) m_network = networkAccessManager()->post(request, m_data); - else if(m_method == QLatin1String("PUT")) + else if (m_method == QLatin1String("PUT")) m_network = networkAccessManager()->put(request, m_data); + else if (m_method == QLatin1String("DELETE")) + m_network = networkAccessManager()->deleteResource(request); QObject::connect(m_network, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(downloadProgress(qint64))); @@ -1525,7 +1527,8 @@ static v8::Handle<v8::Value> qmlxmlhttprequest_open(const v8::Arguments &args) if (method != QLatin1String("GET") && method != QLatin1String("PUT") && method != QLatin1String("HEAD") && - method != QLatin1String("POST")) + method != QLatin1String("POST") && + method != QLatin1String("DELETE")) V8THROW_DOM(SYNTAX_ERR, "Unsupported HTTP method type"); // Argument 1 - URL |