summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-06-05 11:58:59 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-06-05 10:56:25 +0000
commitc5b01489ad096b91311d60d33248df44a82347a8 (patch)
tree50383422940be89df3ddfd8dd8ed28ec72548114
parent264fa6b290db226c32ff25416fcd5a6bc4639fe0 (diff)
Narrow include
Avoid including texture_manager.h that pulls in conflicting GL headers. Task-number: QTBUG-68244 Change-Id: I3174b00498e7a4772d2bb302d886071ba3bd2a64 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
-rw-r--r--src/core/chromium_gpu_helper.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/chromium_gpu_helper.cpp b/src/core/chromium_gpu_helper.cpp
index 73a4da70f..547fbc45c 100644
--- a/src/core/chromium_gpu_helper.cpp
+++ b/src/core/chromium_gpu_helper.cpp
@@ -48,7 +48,7 @@
// GL typedefs cascading through content header includes.
#include "gpu/command_buffer/service/sync_point_manager.h"
#include "gpu/command_buffer/service/mailbox_manager.h"
-#include "gpu/command_buffer/service/texture_manager.h"
+#include "gpu/command_buffer/service/texture_base.h"
#include "content/gpu/gpu_child_thread.h"
#include "gpu/ipc/service/gpu_channel_manager.h"