summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-08-22 11:00:04 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-08-23 08:35:38 +0000
commit84803b4c95b7b0d6849a220e16fc75224b136e0a (patch)
tree3df85c4d13464bf856aa96f5ce8d2fb9a16b7323
parent8ea5459aff7a52b070e6ef7b5f0ed83f972a8e9c (diff)
Work-around moc issue
Recent moc appears to have trouble parsing http_status_code.h, but it is only included due to an unnecessary include in web_engine_context.h we should have used a forward declaration for. Change-Id: Idd586bdb7719627b951a32905e4207fa8db0393d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--src/core/web_engine_context.cpp1
-rw-r--r--src/core/web_engine_context.h5
2 files changed, 5 insertions, 1 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 329f9c9db..426782f4e 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -51,6 +51,7 @@
#if defined(ENABLE_BASIC_PRINTING)
#include "chrome/browser/printing/print_job_manager.h"
#endif // defined(ENABLE_BASIC_PRINTING)
+#include "components/devtools_http_handler/devtools_http_handler.h"
#include "content/browser/gpu/gpu_process_host.h"
#include "content/browser/renderer_host/render_process_host_impl.h"
#include "content/browser/utility_process_host_impl.h"
diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h
index 960f8ed47..3b14f6e00 100644
--- a/src/core/web_engine_context.h
+++ b/src/core/web_engine_context.h
@@ -45,7 +45,6 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/values.h"
-#include "components/devtools_http_handler/devtools_http_handler.h"
#include <QSharedPointer>
@@ -58,6 +57,10 @@ class BrowserMainRunner;
class ContentMainRunner;
}
+namespace devtools_http_handler {
+class DevToolsHttpHandler;
+}
+
#if defined(ENABLE_BASIC_PRINTING)
namespace printing {
class PrintJobManager;