From 7fbe6acb7daaf72a3597dada94d9d527dd727298 Mon Sep 17 00:00:00 2001
From: Szabolcs David <davidsz@inf.u-szeged.hu>
Date: Tue, 18 Feb 2014 02:18:46 -0800
Subject: Build fix for public API test

Patch by Jocelyn Turcotte
This fixes the inclusion of private headers.

Change-Id: I490336ac30571bf292d88e2747102c75027b8dc6
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
 src/webengine/api/qquickwebengineloadrequest_p.h | 1 -
 src/webengine/api/qquickwebengineview_p.h        | 2 +-
 tests/auto/quick/publicapi/publicapi.pro         | 1 +
 tests/auto/quick/publicapi/tst_publicapi.cpp     | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/webengine/api/qquickwebengineloadrequest_p.h b/src/webengine/api/qquickwebengineloadrequest_p.h
index 6f627acb0..b20247942 100644
--- a/src/webengine/api/qquickwebengineloadrequest_p.h
+++ b/src/webengine/api/qquickwebengineloadrequest_p.h
@@ -44,7 +44,6 @@
 
 #include "qtwebengineglobal_p.h"
 #include "qquickwebengineview_p.h"
-#include "web_engine_error.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index 66dc37622..1d4664bf9 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -42,7 +42,7 @@
 #ifndef QQUICKWEBENGINEVIEW_P_H
 #define QQUICKWEBENGINEVIEW_P_H
 
-#include <qtwebengineglobal_p.h>
+#include <private/qtwebengineglobal_p.h>
 #include <QQuickItem>
 
 QT_BEGIN_NAMESPACE
diff --git a/tests/auto/quick/publicapi/publicapi.pro b/tests/auto/quick/publicapi/publicapi.pro
index 1e0a82e68..b178f56cd 100644
--- a/tests/auto/quick/publicapi/publicapi.pro
+++ b/tests/auto/quick/publicapi/publicapi.pro
@@ -1,2 +1,3 @@
 include(../tests.pri)
 QT += webengine
+QT_PRIVATE += webengine-private
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index a5fd120ac..3ce31477b 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -45,8 +45,8 @@
 #include <QMetaProperty>
 #include <QMetaType>
 #include <QtTest/QtTest>
-#include <qquickwebengineview_p.h>
-#include <qquickwebengineloadrequest_p.h>
+#include <private/qquickwebengineview_p.h>
+#include <private/qquickwebengineloadrequest_p.h>
 // FIXME: Implement!
 // #include <qquickwebenginenavigationrequest_p.h>
 
-- 
cgit v1.2.3