Skip to content

Commit b54b46c

Browse files
committed
Set off-the-record to true as documented
The API had no way of setting off-the-record, because the constructor meant for it set it to false. The patch fixes the constructor and adds basic API tests for the QWebEngineProfiles. Change-Id: I407eb4a4b0524b6c4eb944d17d744620dd9db6fb Task-number: QTBUG-48724 Reviewed-by: Kai Koehne <[email protected]>
1 parent 9553493 commit b54b46c

File tree

4 files changed

+83
-3
lines changed

4 files changed

+83
-3
lines changed

src/webenginewidgets/api/qwebengineprofile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ void QWebEngineProfilePrivate::downloadUpdated(const DownloadItemInfo &info)
193193
*/
194194
QWebEngineProfile::QWebEngineProfile(QObject *parent)
195195
: QObject(parent)
196-
, d_ptr(new QWebEngineProfilePrivate(new BrowserContextAdapter(false)))
196+
, d_ptr(new QWebEngineProfilePrivate(new BrowserContextAdapter(true)))
197197
{
198198
d_ptr->q_ptr = this;
199199
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
include(../tests.pri)
2+
exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
3+
QT *= core-private gui-private
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
/****************************************************************************
2+
**
3+
** Copyright (C) 2015 The Qt Company Ltd.
4+
** Contact: http://www.qt.io/licensing/
5+
**
6+
** This file is part of the QtWebEngine module of the Qt Toolkit.
7+
**
8+
** $QT_BEGIN_LICENSE:LGPL$
9+
** Commercial License Usage
10+
** Licensees holding valid commercial Qt licenses may use this file in
11+
** accordance with the commercial license agreement provided with the
12+
** Software or, alternatively, in accordance with the terms contained in
13+
** a written agreement between you and The Qt Company. For licensing terms
14+
** and conditions see http://www.qt.io/terms-conditions. For further
15+
** information use the contact form at http://www.qt.io/contact-us.
16+
**
17+
** GNU Lesser General Public License Usage
18+
** Alternatively, this file may be used under the terms of the GNU Lesser
19+
** General Public License version 3 as published by the Free Software
20+
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
21+
** packaging of this file. Please review the following information to
22+
** ensure the GNU Lesser General Public License version 3 requirements
23+
** will be met: https://www.gnu.org/licenses/lgpl.html.
24+
**
25+
** GNU General Public License Usage
26+
** Alternatively, this file may be used under the terms of the GNU
27+
** General Public License version 2.0 or later as published by the Free
28+
** Software Foundation and appearing in the file LICENSE.GPL included in
29+
** the packaging of this file. Please review the following information to
30+
** ensure the GNU General Public License version 2.0 requirements will be
31+
** met: http://www.gnu.org/licenses/gpl-2.0.html.
32+
**
33+
** $QT_END_LICENSE$
34+
**
35+
****************************************************************************/
36+
37+
#include "../util.h"
38+
#include <QtTest/QtTest>
39+
#include <qwebengineprofile.h>
40+
41+
class tst_QWebEngineProfile : public QObject
42+
{
43+
Q_OBJECT
44+
45+
private Q_SLOTS:
46+
void defaultProfile();
47+
void profileConstructors();
48+
};
49+
50+
void tst_QWebEngineProfile::defaultProfile()
51+
{
52+
QWebEngineProfile *profile = QWebEngineProfile::defaultProfile();
53+
QVERIFY(profile);
54+
QVERIFY(!profile->isOffTheRecord());
55+
QCOMPARE(profile->storageName(), QStringLiteral("Default"));
56+
QCOMPARE(profile->httpCacheType(), QWebEngineProfile::DiskHttpCache);
57+
QCOMPARE(profile->persistentCookiesPolicy(), QWebEngineProfile::AllowPersistentCookies);
58+
}
59+
60+
void tst_QWebEngineProfile::profileConstructors()
61+
{
62+
QWebEngineProfile otrProfile;
63+
QWebEngineProfile diskProfile(QStringLiteral("Test"));
64+
65+
QVERIFY(otrProfile.isOffTheRecord());
66+
QVERIFY(!diskProfile.isOffTheRecord());
67+
QCOMPARE(diskProfile.storageName(), QStringLiteral("Test"));
68+
QCOMPARE(otrProfile.httpCacheType(), QWebEngineProfile::MemoryHttpCache);
69+
QCOMPARE(diskProfile.httpCacheType(), QWebEngineProfile::DiskHttpCache);
70+
QCOMPARE(otrProfile.persistentCookiesPolicy(), QWebEngineProfile::NoPersistentCookies);
71+
QCOMPARE(diskProfile.persistentCookiesPolicy(), QWebEngineProfile::AllowPersistentCookies);
72+
73+
}
74+
75+
QTEST_MAIN(tst_QWebEngineProfile)
76+
#include "tst_qwebengineprofile.moc"

tests/auto/widgets/widgets.pro

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ SUBDIRS += \
66
qwebengineaccessibility \
77
qwebengineframe \
88
qwebenginepage \
9-
qwebenginehistoryinterface \
10-
qwebengineview \
119
qwebenginehistory \
10+
qwebenginehistoryinterface \
1211
qwebengineinspector \
12+
qwebengineprofile \
1313
qwebenginescript \
14+
qwebengineview

0 commit comments

Comments
 (0)