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 /Tools/TestWebKitAPI/PlatformWebView.h | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
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 'Tools/TestWebKitAPI/PlatformWebView.h')
| -rw-r--r-- | Tools/TestWebKitAPI/PlatformWebView.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Tools/TestWebKitAPI/PlatformWebView.h b/Tools/TestWebKitAPI/PlatformWebView.h index 653a17cca..3eb791a19 100644 --- a/Tools/TestWebKitAPI/PlatformWebView.h +++ b/Tools/TestWebKitAPI/PlatformWebView.h @@ -47,10 +47,21 @@ typedef HWND PlatformWindow; typedef WKViewRef PlatformWKView; typedef GtkWidget *PlatformWindow; #elif PLATFORM(EFL) -typedef struct _Evas_Object Evas_Object; typedef struct _Ecore_Evas Ecore_Evas; +#if USE(EO) +typedef struct _Eo Evas_Object; +#else +typedef struct _Evas_Object Evas_Object; +#endif typedef Evas_Object* PlatformWKView; typedef Ecore_Evas* PlatformWindow; +#elif PLATFORM(QT) +QT_BEGIN_NAMESPACE +class QQuickView; +QT_END_NAMESPACE +class QQuickWebView; +typedef QQuickWebView* PlatformWKView; +typedef QQuickView* PlatformWindow; #endif namespace TestWebKitAPI { |