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/WebKit/qt/WidgetApi/qwebframe.cpp | |
| 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/WebKit/qt/WidgetApi/qwebframe.cpp')
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebframe.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebframe.cpp b/Source/WebKit/qt/WidgetApi/qwebframe.cpp index e7286f88e..f3e563cb5 100644 --- a/Source/WebKit/qt/WidgetApi/qwebframe.cpp +++ b/Source/WebKit/qt/WidgetApi/qwebframe.cpp @@ -29,6 +29,7 @@ #include "qwebscriptworld.h" #include "qwebscriptworld_p.h" #include "qwebsecurityorigin.h" +#include "DOMWrapperWorld.h" #include <QMultiMap> #include <qdebug.h> #include <qevent.h> @@ -209,7 +210,7 @@ QWebFrame::QWebFrame(QWebPage *parentPage) d->q = this; d->init(/*page adapter*/ parentPage->handle()); -#if ENABLE(ORIENTATION_EVENTS) +#if ENABLE(ORIENTATION_EVENTS) && HAVE(QTSENSORS) connect(&d->m_orientation, SIGNAL(readingChanged()), this, SLOT(_q_orientationChanged())); d->m_orientation.start(); #endif @@ -222,7 +223,7 @@ QWebFrame::QWebFrame(QWebFrame* parent, QWebFrameData* frameData) d->page = parent->d->page; d->q = this; d->init(parent->d->pageAdapter, frameData); -#if ENABLE(ORIENTATION_EVENTS) +#if ENABLE(ORIENTATION_EVENTS) && HAVE(QTSENSORS) connect(&d->m_orientation, SIGNAL(readingChanged()), this, SLOT(_q_orientationChanged())); d->m_orientation.start(); #endif |