From 7ae7b58955b018aa7294aa07d6ff7754af336f4c Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Thu, 3 Dec 2015 15:29:48 +0100 Subject: Remove FilterRequest from qwebenginecookiestore OnCanSetCookie and OnCanGetCookies should both be mapped to API. Since the other call is missing (filter cookies which should be send) remove existing one from 5.6 Change-Id: I4f42c4a1fee6add7a5efffaf4c38877a1f35ce61 Reviewed-by: Allan Sandfeld Jensen --- tests/quicktestbrowser/BrowserWindow.qml | 8 -------- tests/quicktestbrowser/main.cpp | 8 +------- 2 files changed, 1 insertion(+), 15 deletions(-) (limited to 'tests/quicktestbrowser') diff --git a/tests/quicktestbrowser/BrowserWindow.qml b/tests/quicktestbrowser/BrowserWindow.qml index 3fcca4aab..cf583c60d 100644 --- a/tests/quicktestbrowser/BrowserWindow.qml +++ b/tests/quicktestbrowser/BrowserWindow.qml @@ -79,7 +79,6 @@ ApplicationWindow { property alias javaScriptEnabled: javaScriptEnabled.checked; property alias errorPageEnabled: errorPageEnabled.checked; property alias pluginsEnabled: pluginsEnabled.checked; - property alias thirdPartyCookiesEnabled: thirdPartyCookiesEnabled.checked; } // Make sure the Qt.WindowFullscreenButtonHint is set on OS X. @@ -254,13 +253,6 @@ ApplicationWindow { checkable: true checked: true } - MenuItem { - id: thirdPartyCookiesEnabled - text: "Third party cookies enabled" - checkable: true - checked: true - onToggled: applicationRoot.thirdPartyCookiesEnabled = checked - } MenuItem { id: offTheRecordEnabled text: "Off The Record" diff --git a/tests/quicktestbrowser/main.cpp b/tests/quicktestbrowser/main.cpp index 61977a018..85a02ab34 100644 --- a/tests/quicktestbrowser/main.cpp +++ b/tests/quicktestbrowser/main.cpp @@ -86,15 +86,9 @@ int main(int argc, char **argv) QObject *rootObject = appEngine.rootObjects().first(); QQuickWebEngineProfile *profile = new QQuickWebEngineProfile(rootObject); - QWebEngineCookieStore *client = profile->cookieStore(); const QMetaObject *rootMeta = rootObject->metaObject(); - int index = rootMeta->indexOfProperty("thirdPartyCookiesEnabled"); - Q_ASSERT(index != -1); - QMetaProperty thirdPartyCookiesProperty = rootMeta->property(index); - client->setCookieFilter([rootObject,&thirdPartyCookiesProperty](const QWebEngineCookieStore::FilterRequest&){ return thirdPartyCookiesProperty.read(rootObject).toBool(); }); - - index = rootMeta->indexOfProperty("testProfile"); + int index = rootMeta->indexOfProperty("testProfile"); Q_ASSERT(index != -1); QMetaProperty profileProperty = rootMeta->property(index); profileProperty.write(rootObject, qVariantFromValue(profile)); -- cgit v1.2.3