diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-14 15:38:16 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-14 15:41:27 +0200 |
| commit | 9a1d97707a374e740890a93c74100663e9ebc1a1 (patch) | |
| tree | e111be11c96438455186aa56f360dccdbc59207d /src/plugins/qmljsinspector/qmljsinspectorplugin.h | |
| parent | a66b93d2f31e22ed76f7016046dfe67dcb8da615 (diff) | |
| parent | 9eba87bd92aa2de00e2c191119bc9a9e015e1de5 (diff) | |
| download | qt-creator-9a1d97707a374e740890a93c74100663e9ebc1a1.tar.gz | |
Merge branch 'qmljsinspector'
Conflicts:
src/plugins/qmlinspector/qmlinspectorplugin.cpp
src/plugins/qmljseditor/qmljseditor.h
src/plugins/qmljsinspector/QmlJSInspector.pluginspec
src/tools/qml/qmlobserver/editor/resizehandleitem.h
Diffstat (limited to 'src/plugins/qmljsinspector/qmljsinspectorplugin.h')
| -rw-r--r-- | src/plugins/qmljsinspector/qmljsinspectorplugin.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmljsinspector/qmljsinspectorplugin.h b/src/plugins/qmljsinspector/qmljsinspectorplugin.h index d1696b0668..237b8e566c 100644 --- a/src/plugins/qmljsinspector/qmljsinspectorplugin.h +++ b/src/plugins/qmljsinspector/qmljsinspectorplugin.h @@ -70,7 +70,7 @@ public: // ExtensionSystem::IPlugin interface virtual bool initialize(const QStringList &arguments, QString *errorString); virtual void extensionsInitialized(); - virtual void aboutToShutdown(); + virtual ExtensionSystem::IPlugin::ShutdownFlag aboutToShutdown(); public slots: void activateDebuggerForProject(ProjectExplorer::Project *project, const QString &runMode); |