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/core/render_widget_host_view_qt_delegate.h | |
| 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/core/render_widget_host_view_qt_delegate.h')
| -rw-r--r-- | src/core/render_widget_host_view_qt_delegate.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/render_widget_host_view_qt_delegate.h b/src/core/render_widget_host_view_qt_delegate.h index 39c972f4b..1e50c8f08 100644 --- a/src/core/render_widget_host_view_qt_delegate.h +++ b/src/core/render_widget_host_view_qt_delegate.h @@ -51,6 +51,7 @@ class QEvent; class QPainter; class QSGLayer; class QSGNode; +class QSGRectangleNode; class QSGTexture; class QVariant; class QWindow; @@ -61,11 +62,8 @@ class QSGImageNode; typedef QSGImageNode QSGInternalImageNode; class QSGSimpleTextureNode; typedef QSGSimpleTextureNode QSGTextureNode; -class QSGSimpleRectNode; -typedef QSGSimpleRectNode QSGRectangleNode; #else class QSGInternalImageNode; -class QSGRectangleNode; class QSGImageNode; typedef QSGImageNode QSGTextureNode; #endif |