diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Source/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h b/Source/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h index 2e4147330..b12f97459 100644 --- a/Source/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h +++ b/Source/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h @@ -25,7 +25,18 @@ #include <WebKit2/WKBase.h> #include <WebKit2/WKURL.h> +WK_EXPORT WKURLRef WKURLCreateWithQString(const QString& url); +WK_EXPORT QString WKURLCopyQString(WKURLRef url); + WK_EXPORT WKURLRef WKURLCreateWithQUrl(const QUrl& url); -QUrl WKURLCopyQUrl(WKURLRef url); +WK_EXPORT QUrl WKURLCopyQUrl(WKURLRef url); + +namespace WebKit { +QString adoptToQString(WKURLRef); +QUrl adoptToQUrl(WKURLRef); +} /* namespace WebKit */ + +using WebKit::adoptToQString; +using WebKit::adoptToQUrl; #endif /* WKURLCF_h */ |