From a68f05b6d37b6f0d07fd3c001f6ee4a18da6eea2 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 3 Apr 2018 12:32:56 +0200
Subject: [PATCH] Stop using type_conversion.h from src/core/api
This caused an unnecessary dependency on skia
Change-Id: Ic3f109f985632c3f3cb4c8681e9a8290f463bb53
Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
---
src/core/api/core_api.pro | 4 +---
src/core/api/qwebenginecookiestore.cpp | 11 ++++++++++-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro
index cff7b1506..637a2ffa0 100644
--- a/src/core/api/core_api.pro
+++ b/src/core/api/core_api.pro
@@ -24,9 +24,7 @@ DEFINES += \
CHROMIUM_SRC_DIR = $$QTWEBENGINE_ROOT/$$getChromiumSrcDir()
INCLUDEPATH += $$QTWEBENGINE_ROOT/src/core \
- $$CHROMIUM_SRC_DIR \
- $$CHROMIUM_SRC_DIR/third_party/skia/include/core \
- $$CHROMIUM_SRC_DIR/third_party/skia/include/config
+ $$CHROMIUM_SRC_DIR
linux-g++*: QMAKE_CXXFLAGS += -Wno-unused-parameter
diff --git a/src/core/api/qwebenginecookiestore.cpp b/src/core/api/qwebenginecookiestore.cpp
index 76e79c570..600a55a8c 100644
--- a/src/core/api/qwebenginecookiestore.cpp
+++ b/src/core/api/qwebenginecookiestore.cpp
@@ -43,11 +43,20 @@
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
#include "net/cookie_monster_delegate_qt.h"
-#include "type_conversion.h"
#include <QByteArray>
#include <QUrl>
+
+namespace {
+
+inline GURL toGurl(const QUrl& url)
+{
+ return GURL(url.toString().toStdString());
+}
+
+}
+
QT_BEGIN_NAMESPACE
using namespace QtWebEngineCore;
--
GitLab