Merge remote-tracking branch 'origin/5.4' into 5.5
authorLiang Qi <liang.qi@theqtcompany.com>
Thu, 16 Apr 2015 10:29:42 +0000 (12:29 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Thu, 16 Apr 2015 10:33:27 +0000 (12:33 +0200)
commit9c8edb91f2c6c7de8228e018dbd1ae7a656b3097
tree717b1df74793af50bd6daaa6775b923a74b05063
parent5870667929ac5f45805b1e1e656fec81b9b22337
parent2b3c2339616680537145a9cc2e7567575add1abb
Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
tests/auto/qml/debugger/qv4profilerservice/qv4profilerservice.pro
tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler.pro

Change-Id: I76d87e3df97ebdba902ca3d7488c1582eca2a83c
src/3rdparty/masm/assembler/MacroAssemblerMIPS.h
src/plugins/qmltooling/shared/qpacketprotocol.cpp
src/qml/jit/qv4binop.cpp
src/qml/qml/v8/qqmlbuiltinfunctions.cpp
src/quickwidgets/qquickwidget_p.h
tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler.pro
tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro
tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
tools/qmlprofiler/qpacketprotocol.cpp