From c5b01489ad096b91311d60d33248df44a82347a8 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 5 Jun 2018 11:58:59 +0200 Subject: Narrow include Avoid including texture_manager.h that pulls in conflicting GL headers. Task-number: QTBUG-68244 Change-Id: I3174b00498e7a4772d2bb302d886071ba3bd2a64 Reviewed-by: Viktor Engelmann --- src/core/chromium_gpu_helper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- cgit v1.2.3