diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index 448c838732d..3ed752464ea 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -61,6 +61,7 @@ #include #include #include +#include namespace QmlDesigner { @@ -126,8 +127,10 @@ QmlDesignerPlugin::~QmlDesignerPlugin() //////////////////////////////////////////////////// bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage/* = 0*/) // =0; { - if (errorMessage) - errorMessage->clear(); + if (!QOpenGLContext().create()) { + *errorMessage = tr("Cannot create OpenGL context."); + return false; + } data = new QmlDesignerPluginData; diff --git a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp index 31bf2ac0616..694424ca98f 100644 --- a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp @@ -37,6 +37,7 @@ #include #include +#include #include 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(); }; diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 7197099153e..91d65f78e9f 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -659,6 +659,8 @@ QList BaseQtVersion::qtAbis() const bool BaseQtVersion::equals(BaseQtVersion *other) { + if (m_qmakeCommand != other->m_qmakeCommand) + return false; if (type() != other->type()) return false; if (uniqueId() != other->uniqueId()) diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 4ae5c96c4af..0b7ac6e0e40 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -51,6 +51,7 @@ #include #include +#include #include #ifdef USE_QUICK_WIDGET @@ -286,8 +287,13 @@ WelcomePlugin::WelcomePlugin() { } -bool WelcomePlugin::initialize(const QStringList & /* arguments */, QString * /* errorMessage */) +bool WelcomePlugin::initialize(const QStringList & /* arguments */, QString *errorMessage) { + if (!QOpenGLContext().create()) { + *errorMessage = tr("Cannot create OpenGL context."); + return false; + } + m_welcomeMode = new WelcomeMode; addAutoReleasedObject(m_welcomeMode);