diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-03-08 18:35:03 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-03-08 18:35:03 +0100 |
| commit | d9ea4917ca97aeee050a86151fbfa069771b498d (patch) | |
| tree | 21fd6960d8a866bf6f5a5a8f9db9be801f8065c1 /src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservicefactory.cpp | |
| parent | f9beafddd256cd0b79bf2478a812053ef61241fc (diff) | |
| parent | c6a26c248e8abc421b87c3dd6b2466d490ea902e (diff) | |
Merge remote-tracking branch 'gerrit/5.11' into wip/webassembly
Change-Id: I729af792166fd2f6c5843ba564e63adf8ae09a97
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservicefactory.cpp')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservicefactory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservicefactory.cpp b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservicefactory.cpp index 1841c82d5d..c0b74c74ff 100644 --- a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservicefactory.cpp +++ b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservicefactory.cpp @@ -48,7 +48,7 @@ QQmlDebugService *QQmlNativeDebugServiceFactory::create(const QString &key) if (key == QQmlNativeDebugServiceImpl::s_key) return new QQmlNativeDebugServiceImpl(this); - return 0; + return nullptr; } QT_END_NAMESPACE |