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

diff --cc src/3rdparty/masm/assembler/MacroAssemblerMIPS.h
Simple merge

diff --cc src/plugins/qmltooling/shared/qpacketprotocol.cpp
Simple merge

diff --cc src/qml/jit/qv4binop.cpp
Simple merge

diff --cc src/qml/qml/v8/qqmlbuiltinfunctions.cpp
Simple merge

diff --cc src/quickwidgets/qquickwidget_p.h
Simple merge

diff --cc tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler.pro
index 330c8bc,0000000..eb41f75
mode 100644,000000..100644
--- 1/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler.pro
--- /dev/null
+++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler.pro
@@@ -1,13 -1,0 +1,13 @@@
- QT += qml testlib gui-private
 +CONFIG += testcase
 +TARGET = tst_qqmldebuggingenabler
++QT += qml testlib gui-private core-private
 +osx:CONFIG -= app_bundle
 +
 +SOURCES +=     tst_qqmldebuggingenabler.cpp
 +
 +INCLUDEPATH += ../shared
 +include(../../../shared/util.pri)
 +include(../shared/debugutil.pri)
 +
 +OTHER_FILES += data/test.qml
 +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 QT_QML_DEBUG_NO_WARNING

diff --cc tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro
Simple merge

diff --cc tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
Simple merge

diff --cc tools/qmlprofiler/qpacketprotocol.cpp
Simple merge