diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-20 13:38:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-20 18:27:44 +0200 |
| commit | 25ccef35eb19fd656eba2a7abe5419972ed28552 (patch) | |
| tree | e0c92532c3c70135d0a547675414e95d21a66822 /src/webengine/api/qquickwebengineprofile.h | |
| parent | 3398abfc1b5b789d11592aada0b5860e36a50041 (diff) | |
| parent | e91f09947b55dda8a13b2aeb0963836dee2ece8d (diff) | |
| download | qtwebengine-25ccef35eb19fd656eba2a7abe5419972ed28552.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/3rdparty
src/core/permission_manager_qt.cpp
src/core/renderer/web_channel_ipc_transport.cpp
src/core/renderer/web_channel_ipc_transport.h
Change-Id: I25fd8ed7c433dadce44d8ac1e39f86e211ec25f0
Diffstat (limited to 'src/webengine/api/qquickwebengineprofile.h')
| -rw-r--r-- | src/webengine/api/qquickwebengineprofile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebengineprofile.h b/src/webengine/api/qquickwebengineprofile.h index 9240132b2..dc5aa7df8 100644 --- a/src/webengine/api/qquickwebengineprofile.h +++ b/src/webengine/api/qquickwebengineprofile.h @@ -127,7 +127,7 @@ public: void removeUrlSchemeHandler(QWebEngineUrlSchemeHandler *); void removeAllUrlSchemeHandlers(); - void clearHttpCache(); + Q_REVISION(2) Q_INVOKABLE void clearHttpCache(); static QQuickWebEngineProfile *defaultProfile(); |