forked from qt-creator/qt-creator
Welcome: Check in initialize if OpenGl context can be created
Task-number: QTCREATORBUG-15040 Change-Id: I8c78ac0a3b979c4ec8e088cd1be3c6aeb04ff339 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
@@ -51,6 +51,7 @@
|
|||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
|
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
|
#include <QOpenGLContext>
|
||||||
#include <QQmlPropertyMap>
|
#include <QQmlPropertyMap>
|
||||||
|
|
||||||
#ifdef USE_QUICK_WIDGET
|
#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;
|
m_welcomeMode = new WelcomeMode;
|
||||||
addAutoReleasedObject(m_welcomeMode);
|
addAutoReleasedObject(m_welcomeMode);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user