Merge remote-tracking branch 'origin/5.4' into 5.5
authorSimon Hausmann <simon.hausmann@theqtcompany.com>
Mon, 27 Apr 2015 07:52:51 +0000 (09:52 +0200)
committerSimon Hausmann <simon.hausmann@theqtcompany.com>
Mon, 27 Apr 2015 12:40:00 +0000 (14:40 +0200)
commite2447f9f5fbe6c8c070ce454bb48c5e45b8c35b3
tree5ea8ffde57b47a44577ca79b90daafab52eedd1b
parent8018c4b6e7743c576a3548f6e73e588f19f632a9
parent7302bc550aa75600c7cdcf5c3d34404e0a09cf67
Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
.qmake.conf
tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp

Change-Id: I715b8a78b74cbe0dcaf599367fd6e08af4858e11
23 files changed:
src/qml/doc/src/qmlfunctions.qdoc
src/qml/jsruntime/qv4engine.cpp
src/qml/types/qqmlinstantiator.cpp
tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
tests/auto/qml/qqmlxmlhttprequest/data/receive_binary_data.expect
tests/auto/qml/qqmlxmlhttprequest/data/send_data.10.expect
tests/auto/qml/qqmlxmlhttprequest/data/send_data.8.expect
tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.expect
tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp
tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp
tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp
tests/auto/quick/qquickimage/tst_qquickimage.cpp
tests/auto/quick/qquickloader/tst_qquickloader.cpp
tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp
tests/auto/quick/qquicktext/tst_qquicktext.cpp
tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
tests/auto/shared/testhttpserver.cpp
tests/auto/shared/testhttpserver.h