diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-03-10 10:53:49 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-13 13:39:54 +0100 |
commit | b8afc009afcca84a3fd3d5617dfe96c729c531aa (patch) | |
tree | 10bdbfb63b3aee36da0344cd8f05184b06b47f37 /src/quickwidgets | |
parent | d6e932b3682c7f8cd610d7554a52c9856d7e67c1 (diff) |
Consolidate context creation failure handling in Quick.
Add QQuickWidget::sceneGraphError() equivalent to
QQuickWindow::sceneGraphError(), move message formatting code
to QQuickWindowPrivate.
Change-Id: I18cd4d7e0f6ee1011c29375218dc6a044b0d2cf2
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src/quickwidgets')
-rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 45 | ||||
-rw-r--r-- | src/quickwidgets/qquickwidget.h | 1 | ||||
-rw-r--r-- | src/quickwidgets/qquickwidget_p.h | 1 |
3 files changed, 46 insertions, 1 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index dbc7d6c21a..46db2ddfeb 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -56,6 +56,12 @@ #include <QtCore/qbasictimer.h> #include <QtGui/QOffscreenSurface> +#ifdef Q_OS_WIN +# include <QtWidgets/QMessageBox> +# include <QtCore/QLibraryInfo> +# include <QtCore/qt_windows.h> +#endif + QT_BEGIN_NAMESPACE extern Q_GUI_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_format, bool include_alpha); @@ -387,6 +393,21 @@ QQmlContext* QQuickWidget::rootContext() const */ /*! + \fn void QQuickWidget::sceneGraphError(QQuickWindow::SceneGraphError error, const QString &message) + + This signal is emitted when an error occurred during scene graph initialization. + + Applications should connect to this signal if they wish to handle errors, + like OpenGL context creation failures, in a custom way. When no slot is + connected to the signal, the behavior will be different: Quick will print + the message, or show a message box, and terminate the application. + + This signal will be emitted from the gui thread. + + \sa QQuickWindow::sceneGraphError() + */ + +/*! \property QQuickWidget::status The component's current \l{QQuickWidget::Status} {status}. */ @@ -510,6 +531,27 @@ QSize QQuickWidgetPrivate::rootObjectSize() const return rootObjectSize; } +void QQuickWidgetPrivate::handleContextCreationFailure(const QSurfaceFormat &format, bool isEs) +{ + Q_Q(QQuickWidget); + + QString translatedMessage; + QString untranslatedMessage; + QQuickWindowPrivate::contextCreationFailureMessage(format, &translatedMessage, &untranslatedMessage, isEs); + + static const QMetaMethod errorSignal = QMetaMethod::fromSignal(&QQuickWidget::sceneGraphError); + const bool signalConnected = q->isSignalConnected(errorSignal); + if (signalConnected) + emit q->sceneGraphError(QQuickWindow::ContextNotAvailable, translatedMessage); + +#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT) + if (!signalConnected && !QLibraryInfo::isDebugBuild() && !GetConsoleWindow()) + QMessageBox::critical(q, QCoreApplication::applicationName(), translatedMessage); +#endif // Q_OS_WIN && !Q_OS_WINCE && !Q_OS_WINRT + if (!signalConnected) + qFatal("%s", qPrintable(untranslatedMessage)); +} + void QQuickWidgetPrivate::createContext() { if (context) @@ -521,9 +563,10 @@ void QQuickWidgetPrivate::createContext() if (QSGContext::sharedOpenGLContext()) context->setShareContext(QSGContext::sharedOpenGLContext()); // ??? is this correct if (!context->create()) { - qWarning("QQuickWidget: failed to create OpenGL context"); + const bool isEs = context->isES(); delete context; context = 0; + handleContextCreationFailure(offscreenWindow->requestedFormat(), isEs); return; } diff --git a/src/quickwidgets/qquickwidget.h b/src/quickwidgets/qquickwidget.h index 614d5b82a6..2c021c85fb 100644 --- a/src/quickwidgets/qquickwidget.h +++ b/src/quickwidgets/qquickwidget.h @@ -95,6 +95,7 @@ public Q_SLOTS: Q_SIGNALS: void statusChanged(QQuickWidget::Status); + void sceneGraphError(QQuickWindow::SceneGraphError error, const QString &message); private Q_SLOTS: void continueExecute(); diff --git a/src/quickwidgets/qquickwidget_p.h b/src/quickwidgets/qquickwidget_p.h index 2d2d6500b2..1ba06162f9 100644 --- a/src/quickwidgets/qquickwidget_p.h +++ b/src/quickwidgets/qquickwidget_p.h @@ -86,6 +86,7 @@ public: void renderSceneGraph(); void createContext(); void destroyContext(); + void handleContextCreationFailure(const QSurfaceFormat &format, bool isEs); GLuint textureId() const Q_DECL_OVERRIDE; |