From dc0b9a995da7c4147b878cbaa8e7e144bc62bec4 Mon Sep 17 00:00:00 2001
From: Pierre Rossi <pierre.rossi@theqtcompany.com>
Date: Thu, 26 Mar 2015 15:25:00 +0100
Subject: Fix publicapi test failures
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The API still needs to be updated to take out the EXPECT_FAIL

Change-Id: Ib10019bccb1d05e61ddeaf91e645f4899284487f
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
---
 tests/auto/quick/publicapi/tst_publicapi.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index eda098e9c..af24f42ed 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -55,6 +55,7 @@
 #include <private/qquickwebenginenewviewrequest_p.h>
 #include <private/qquickwebengineprofile_p.h>
 #include <private/qquickwebenginescript_p.h>
+#include <private/qquickwebenginesettings_p.h>
 
 class tst_publicapi : public QObject {
     Q_OBJECT
@@ -73,6 +74,7 @@ static QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *>()
     << &QQuickWebEngineNewViewRequest::staticMetaObject
     << &QQuickWebEngineProfile::staticMetaObject
     << &QQuickWebEngineScript::staticMetaObject
+    << &QQuickWebEngineSettings::staticMetaObject
     << &QQuickWebEngineFullScreenRequest::staticMetaObject
     ;
 
@@ -81,6 +83,10 @@ static QList<const char *> knownEnumNames = QList<const char *>();
 static QStringList hardcodedTypes = QStringList()
     << "QJSValue"
     << "QQmlListProperty<QQuickWebEngineScript>"
+    << "QQmlWebChannel*"
+    // Ignore the testSupport types without making a fuss.
+    << "QQuickWebEngineTestSupport*"
+    << "QQuickWebEngineErrorPage*"
     ;
 
 static QStringList expectedAPI = QStringList()
-- 
cgit v1.2.3