Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into merge
authorSimon Hausmann <simon.hausmann@digia.com>
Fri, 26 Jul 2013 09:52:06 +0000 (11:52 +0200)
committerSimon Hausmann <simon.hausmann@digia.com>
Fri, 26 Jul 2013 09:52:32 +0000 (11:52 +0200)
commit993bc84f49b4922480f6ec566f31c24465f0e005
tree5189edc8e2e0942459d09a4765ad17dd681fe801
parent713a4c5b1d601f57d538fdbb1e8f6bc05ce07275
parent84871192077c18bb093c6259339200bd22d64f00
Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into merge

Change-Id: I5824a3eb624b325de10acfd5109c4c1bdabcf780
src/qml/qml/qqmlxmlhttprequest.cpp
tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
tests/auto/quick/dialogs/dialogs.pro
tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp