Merge remote-tracking branch 'origin/3.5'

Change-Id: Icef35a3d74c03c8a26e4794734801cd107cd9e04
This commit is contained in:
Eike Ziller
2015-09-28 09:43:31 +02:00
4 changed files with 20 additions and 4 deletions

View File

@@ -37,6 +37,7 @@
#include <analyzerbase/analyzermanager.h>
#include <extensionsystem/pluginmanager.h>
#include <QOpenGLContext>
#include <QtPlugin>
using namespace Analyzer;
@@ -52,7 +53,11 @@ QmlProfilerPlugin *QmlProfilerPlugin::instance = 0;
bool QmlProfilerPlugin::initialize(const QStringList &arguments, QString *errorString)
{
Q_UNUSED(arguments)
Q_UNUSED(errorString)
if (!QOpenGLContext().create()) {
*errorString = tr("Cannot create OpenGL context.");
return false;
}
auto tool = new QmlProfilerTool(this);
auto widgetCreator = [tool] { return tool->createWidgets(); };