feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch 'qmljsinspector'

Browse Source 
Conflicts:
	src/plugins/qmlinspector/qmlinspectorplugin.cpp
	src/plugins/qmljseditor/qmljseditor.h
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/tools/qml/qmlobserver/editor/resizehandleitem.h
This commit is contained in:
Olivier Goffart
2010-07-14 15:38:16 +02:00
parent a66b93d2f3 9eba87bd92
commit 9a1d97707a
685 changed files with 17658 additions and 34446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmljsinspector/qmljsinspectorplugin.cpp
View File

@@ -114,8 +114,9 @@ Inspector *InspectorPlugin::inspector() const
return _inspector;
}
void InspectorPlugin::aboutToShutdown()
ExtensionSystem::IPlugin::ShutdownFlag InspectorPlugin::aboutToShutdown()
{
return SynchronousShutdown;
}
bool InspectorPlugin::initialize(const QStringList &arguments, QString *errorString)