From 14992ac7cf0754b8a97a8cedf40c2b63aa26d421 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Mon, 27 Jan 2014 15:52:09 +0100 Subject: Fix the build on embedded platforms We should not include chromium headers outside of core since they might depend on defines or other build options only set in the gyp/ninja environment. This patch removes the need to include net/base/net_errors.h in the API implementation of the QQuickWebEngineView and also removes the chromium source directory from the global include path. This prevents including chromium headers outside of core by mistake and also makes it possible to load the project in QtCreator without disabling indexing. Change-Id: Icd13b6caa52509ef2a1b6b44eaffb34d8ae4addf Reviewed-by: Zeno Albisser --- src/webengine/api/qquickwebengineview.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/webengine') diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index b8cc98a3c..a99707730 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -42,7 +42,6 @@ #include "qquickwebengineview_p.h" #include "qquickwebengineview_p_p.h" -#include "net/base/net_errors.h" #include "javascript_dialog_controller.h" #include "qquickwebengineloadrequest_p.h" #include "render_widget_host_view_qt_delegate_quick.h" @@ -236,7 +235,7 @@ qreal QQuickWebEngineViewPrivate::dpiScale() const void QQuickWebEngineViewPrivate::loadFinished(bool success, int error_code, const QString &error_description) { Q_Q(QQuickWebEngineView); - if (error_code == net::ERR_ABORTED) { + if (error_code == WebEngineError::UserAbortedError) { QQuickWebEngineLoadRequest loadRequest(q->url(), QQuickWebEngineView::LoadStoppedStatus); Q_EMIT q->loadingStateChanged(&loadRequest); return; -- cgit v1.2.3