diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-06-19 16:34:59 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-06-19 16:34:59 +0200 |
| commit | 057b7fd01d503127eb4b65331943aad4c9f70e5e (patch) | |
| tree | c68c7bb5a29d638f7d8675ee7a4700ba2a87b4c5 /shared | |
| parent | 4b09be3d945483290ccc42ab84a5d16757096a9e (diff) | |
Fix the build.
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/shared_globals.cpp | 4 | ||||
| -rw-r--r-- | shared/shared_globals.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/shared/shared_globals.cpp b/shared/shared_globals.cpp index eab332869..082a84215 100644 --- a/shared/shared_globals.cpp +++ b/shared/shared_globals.cpp @@ -46,8 +46,6 @@ #include <QScreen> #include <QWindow> -namespace content { - void GetScreenInfoFromNativeWindow(QWindow* window, WebKit::WebScreenInfo* results) { QScreen* screen = window->screen(); @@ -65,6 +63,8 @@ void GetScreenInfoFromNativeWindow(QWindow* window, WebKit::WebScreenInfo* resul *results = r; } +namespace content { + RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost*) { // WebContentsViewQt should take care of this directly. Q_ASSERT(false); diff --git a/shared/shared_globals.h b/shared/shared_globals.h index a42efd6a2..0014c8717 100644 --- a/shared/shared_globals.h +++ b/shared/shared_globals.h @@ -46,10 +46,6 @@ class QWindow; -namespace content { - void GetScreenInfoFromNativeWindow(QWindow* window, WebKit::WebScreenInfo* results); -} - #endif |