diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-10-31 13:59:44 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-06 17:34:12 +0100 |
| commit | fbf3e79512358a3eb1e6589b10ac01917b2e94d0 (patch) | |
| tree | 37de83061cf9f7c7d7f4f42edf26dde2f05b3ab8 /lib/render_widget_host_view_qt_delegate.h | |
| parent | a99fdc02797ece15253ff863102d3257945abfab (diff) | |
Move DelegatedFrameNode and the SG logic to its own file.
This avoids polluting render_widget_host_view_qt_delegate.cpp
Change-Id: I06af66f01f842e105bbded75b01f9c8346fd5df9
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'lib/render_widget_host_view_qt_delegate.h')
| -rw-r--r-- | lib/render_widget_host_view_qt_delegate.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/render_widget_host_view_qt_delegate.h b/lib/render_widget_host_view_qt_delegate.h index 36a6ceb9d..3486e3f8d 100644 --- a/lib/render_widget_host_view_qt_delegate.h +++ b/lib/render_widget_host_view_qt_delegate.h @@ -42,15 +42,6 @@ #ifndef RENDER_WIDGET_HOST_VIEW_QT_DELEGATE_H #define RENDER_WIDGET_HOST_VIEW_QT_DELEGATE_H -// On Mac we need to reset this define in order to prevent definition -// of "check" macros etc. The "check" macro collides with a member function name in QtQuick. -// See AssertMacros.h in the Mac SDK. -#include <QtGlobal> // We need this for the Q_OS_MAC define. -#if defined(Q_OS_MAC) -#undef __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES -#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 -#endif - #include "qtwebengineglobal.h" #include <QRect> |