diff --git a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp index d26a51f0f50..3af2f214429 100644 --- a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp @@ -105,7 +105,10 @@ ExtensionSystem::IPlugin::ShutdownFlag QmlProfilerPlugin::aboutToShutdown() QList QmlProfilerPlugin::getModels(QmlProfilerModelManager *manager) const { - return factory->create(manager); + if (factory) + return factory->create(manager); + else + return QList(); } } // namespace Internal diff --git a/src/plugins/qmlprofiler/qmlprofilerplugin.h b/src/plugins/qmlprofiler/qmlprofilerplugin.h index cd8e6fd777c..83f9af6c5d7 100644 --- a/src/plugins/qmlprofiler/qmlprofilerplugin.h +++ b/src/plugins/qmlprofiler/qmlprofilerplugin.h @@ -46,7 +46,7 @@ class QmlProfilerPlugin : public ExtensionSystem::IPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "QmlProfiler.json") public: - QmlProfilerPlugin() {} + QmlProfilerPlugin() : factory(0) {} bool initialize(const QStringList &arguments, QString *errorString); void extensionsInitialized();