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

QmlProfiler: Don't use the model factory if it doesn't exist

Browse Source 
The model factory only exists if there is a plugin providing it. Also,
it's a good idea to initialize it.

Change-Id: I904bae1e733c37699a99e84e79c67ab4e8aea805
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2014-11-27 10:36:58 +01:00
parent 2d58001d86
commit 13c7d1c2ce
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmlprofiler/qmlprofilerplugin.cpp
View File

@@ -105,7 +105,10 @@ ExtensionSystem::IPlugin::ShutdownFlag QmlProfilerPlugin::aboutToShutdown()
QList<QmlProfilerTimelineModel *> QmlProfilerPlugin::getModels(QmlProfilerModelManager *manager) const QList<QmlProfilerTimelineModel *> QmlProfilerPlugin::getModels(QmlProfilerModelManager *manager) const
{ {
if (factory)
return factory->create(manager); return factory->create(manager);
else
return QList<QmlProfilerTimelineModel *>();
} }
} // namespace Internal } // namespace Internal

2
src/plugins/qmlprofiler/qmlprofilerplugin.h
View File

@@ -46,7 +46,7 @@ class QmlProfilerPlugin : public ExtensionSystem::IPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "QmlProfiler.json") Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "QmlProfiler.json")
public: public:
QmlProfilerPlugin() {} QmlProfilerPlugin() : factory(0) {}
bool initialize(const QStringList &arguments, QString *errorString); bool initialize(const QStringList &arguments, QString *errorString);
void extensionsInitialized(); void extensionsInitialized();