aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/debugger/qml/qmlcppengine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/debugger/qml/qmlcppengine.cpp')
-rw-r--r--src/plugins/debugger/qml/qmlcppengine.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 387a382426..7869dd7897 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -20,7 +20,13 @@ DebuggerEngine *createQmlEngine(const DebuggerStartParameters &);
DebuggerEngine *createQmlCppEngine(const DebuggerStartParameters &sp)
{
- return new QmlCppEngine(sp);
+ QmlCppEngine *newEngine = new QmlCppEngine(sp);
+ if (newEngine->cppEngine()) {
+ return newEngine;
+ } else {
+ delete newEngine;
+ return 0;
+ }
}
} // namespace Internal
@@ -58,8 +64,10 @@ QmlCppEngine::QmlCppEngine(const DebuggerStartParameters &sp)
} else {
QString errorMessage;
d->m_cppEngine = Internal::createCdbEngine(sp, &errorMessage);
- if (!d->m_cppEngine)
+ if (!d->m_cppEngine) {
qWarning("%s", qPrintable(errorMessage));
+ return;
+ }
}
d->m_cppEngine->setRunInWrapperEngine(true);