summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2017-07-03 12:46:34 -0700
committerDmitry Shachnev <mitya57@gmail.com>2017-09-20 07:21:28 +0000
commit23d86b98f095a25b6bc78b9d3654077a7f1f5c04 (patch)
tree3f50d75ed5fa7cb6481ff201b28f9b16cdc9a35f
parent27928c63ae4ba1a904c67851e5e93fc4f748a55e (diff)
Fix build when Qt uses OpenGL ES 2
The QT_OPENGL_ES_2 macro is a QtGui feature, so it's not provided by qglobal.h, but instead qtguiglobal.h (a header new in 5.8.0). Using the QtGui/ prefix here to make sure it includes even if WTF/Platform.h is compiled without -I$QTDIR/include/QtGui. Change-Id: I8d96dea9955d4c749b99fffd14cde9c566436381 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--Source/WTF/wtf/Platform.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index f3d725217..0666ac710 100644
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -1052,6 +1052,9 @@
#if PLATFORM(QT)
#ifdef __cplusplus
#include <qglobal.h>
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
+#include <QtGui/qtguiglobal.h>
+#endif
#endif
#if defined(QT_OPENGL_ES_2) && !defined(USE_OPENGL_ES_2)
#define USE_OPENGL_ES_2 1