diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-20 06:08:18 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-20 06:08:18 +0200 |
commit | 6c344184df2dd6573681a0d2022daa55b6a36f38 (patch) | |
tree | 91493089f958b95138bdbd3f838188450e4349bb /src/webenginewidgets/api/qwebengineprofile.h | |
parent | bfc5eb719d30decaf5c65e2747d49a6eec28794d (diff) | |
parent | bc317d32a65eb08da7df10bec6417829533cfc3a (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/core/browser_context_adapter.cpp
src/core/web_contents_adapter.cpp
tests/auto/widgets/qwebenginepage/BLACKLIST
Change-Id: I45ee0a33f6316f585555d58fede8072fe514aecf
Diffstat (limited to 'src/webenginewidgets/api/qwebengineprofile.h')
-rw-r--r-- | src/webenginewidgets/api/qwebengineprofile.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/webenginewidgets/api/qwebengineprofile.h b/src/webenginewidgets/api/qwebengineprofile.h index 22a913fb2..d981fa5bb 100644 --- a/src/webenginewidgets/api/qwebengineprofile.h +++ b/src/webenginewidgets/api/qwebengineprofile.h @@ -63,8 +63,8 @@ class QWebEngineUrlSchemeHandler; class QWEBENGINEWIDGETS_EXPORT QWebEngineProfile : public QObject { Q_OBJECT public: - explicit QWebEngineProfile(QObject *parent = 0); - explicit QWebEngineProfile(const QString &name, QObject *parent = 0); + explicit QWebEngineProfile(QObject *parent = Q_NULLPTR); + explicit QWebEngineProfile(const QString &name, QObject *parent = Q_NULLPTR); virtual ~QWebEngineProfile(); enum HttpCacheType { @@ -132,7 +132,7 @@ private Q_SLOTS: private: Q_DISABLE_COPY(QWebEngineProfile) Q_DECLARE_PRIVATE(QWebEngineProfile) - QWebEngineProfile(QWebEngineProfilePrivate *, QObject *parent = 0); + QWebEngineProfile(QWebEngineProfilePrivate *, QObject *parent = Q_NULLPTR); friend class QWebEnginePagePrivate; friend class QWebEngineUrlSchemeHandler; |