diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-26 11:51:06 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-28 09:45:57 +0000 |
| commit | 9cda8d4384825bd93b949f31953548beda165ef8 (patch) | |
| tree | 2f0edac480d7557c918badb64b07bce7c6447b5a /src/webengine/render_widget_host_view_qt_delegate_quick.cpp | |
| parent | 54b7425c356378018c511bd9087f06767d0bc708 (diff) | |
Restore ability to build with Qt 5.7v5.8.0-alpha1
Defines the qtConfig() test for older Qt versions, and fix
conflict between two QSGRectangle definitions.
Change-Id: Icf4ef2f88d9e98e7aea4e88d777827bf69a4c281
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/webengine/render_widget_host_view_qt_delegate_quick.cpp')
| -rw-r--r-- | src/webengine/render_widget_host_view_qt_delegate_quick.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp index c17c6da06..e9b8dea44 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp @@ -206,7 +206,8 @@ QSGRectangleNode *RenderWidgetHostViewQtDelegateQuick::createRectangleNode() #if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) return QQuickItem::window()->createRectangleNode(); #else - return new QSGSimpleRectNode(); + QSGRenderContext *renderContext = QQuickWindowPrivate::get(QQuickItem::window())->context; + return renderContext->sceneGraphContext()->createRectangleNode(); #endif } |