From 734725ffc88e5b04f1ed7d7f801e0b39e7580756 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Fri, 25 Sep 2015 13:15:28 +0200 Subject: Welcome: Check in initialize if OpenGl context can be created Task-number: QTCREATORBUG-15040 Change-Id: I8c78ac0a3b979c4ec8e088cd1be3c6aeb04ff339 Reviewed-by: Eike Ziller --- src/plugins/welcome/welcomeplugin.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 4ae5c96c4a..0b7ac6e0e4 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); -- cgit v1.2.3