diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-26 01:00:11 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-04-09 10:08:41 +0200 |
| commit | 2812184e1bb87cd94d2989162bc6ea954bb585c4 (patch) | |
| tree | 25460548730e2ddc1f6f328d54e97d3fbfb49d21 /src/qmldebug | |
| parent | cd4a99a7ba92968bf88da9af2624bb738d71e726 (diff) | |
| parent | bf205b45a29ba80d94df3b6bac5fec4c7cd79bf9 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/qml/jsruntime/qv4executablecompilationunit.cpp
src/qml/jsruntime/qv4executablecompilationunit_p.h
src/qml/qml/qqmlobjectcreator.cpp
src/qml/qml/qqmlpropertycachecreator_p.h
src/qml/qml/qqmltypecompiler.cpp
src/qml/qml/qqmltypedata.cpp
tests/auto/qml/qmlformat/tst_qmlformat.cpp
tools/qmllint/scopetree.cpp
src/qml/qml/qqmlapplicationengine_p.h
Adjusted tools/qmllint/findunqualified.cpp to use newer API
Change-Id: Ibfb4678ca39d626d47527265e3c96e43313873d4
Diffstat (limited to 'src/qmldebug')
| -rw-r--r-- | src/qmldebug/qqmldebugconnection.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qmldebug/qqmldebugconnection.cpp b/src/qmldebug/qqmldebugconnection.cpp index 9d495ce6e4..81b69d1216 100644 --- a/src/qmldebug/qqmldebugconnection.cpp +++ b/src/qmldebug/qqmldebugconnection.cpp @@ -416,8 +416,7 @@ public: { connect(parent, &QLocalSocket::stateChanged, this, &LocalSocketSignalTranslator::onStateChanged); - connect(parent, static_cast<void(QLocalSocket::*)(QLocalSocket::LocalSocketError)>( - &QLocalSocket::errorOccurred), this, &LocalSocketSignalTranslator::onError); + connect(parent, &QLocalSocket::errorOccurred, this, &LocalSocketSignalTranslator::onError); } void onError(QLocalSocket::LocalSocketError error) |