Commit 3383a204 authored by Thorbjørn Lindeijer's avatar Thorbjørn Lindeijer
Browse files

Specify the right parent for the QDeclarativeViewObserver

This makes sure it gets deleted together with the QmlApplicationViewer,
rather than probably not at all when no parent is specified for the
viewer (which is the default).

Reviewed-by: Alessandro Portale
Reviewed-by: Christiaan Janssen
parent 1ed42339
......@@ -80,7 +80,7 @@ QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) :
new QmlJSDebugger::JSDebuggerAgent(engine());
#endif
#if defined(QMLJSDEBUGGER) && !defined(NO_QMLOBSERVER)
new QmlJSDebugger::QDeclarativeViewObserver(this, parent);
new QmlJSDebugger::QDeclarativeViewObserver(this, this);
#endif
}
......
......@@ -423,7 +423,7 @@ QList<DeploymentFolder> QtQuickApp::deploymentFolders() const
return result;
}
const int QtQuickApp::StubVersion = 10;
const int QtQuickApp::StubVersion = 11;
} // namespace Internal
} // namespace Qt4ProjectManager
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment