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

Merge QmlProfiler and QmlProfilerExtension plugins

Browse Source 
Change-Id: Iaa1de7afda664a7a0779f47d104f863a16a34976
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-04-26 10:21:00 +02:00
parent ac2005b4e8
commit 600e1cdcea
37 changed files with 133 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,8 +41,6 @@ class QmlProfilerPlugin : public ExtensionSystem::IPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "QmlProfiler.json")
public:
QmlProfilerPlugin() : factory(0) {}
bool initialize(const QStringList &arguments, QString *errorString);
void extensionsInitialized();
ShutdownFlag aboutToShutdown();
@@ -50,11 +48,7 @@ public:
static bool debugOutput;
static QmlProfilerPlugin *instance;
QList<QmlProfilerTimelineModel *> getModels(QmlProfilerModelManager *manager) const;
static QmlProfilerSettings *globalSettings();
private:
QmlProfilerTimelineModelFactory *factory;
};
} // namespace Internal