diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
| commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
| tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit/qt/Api/qwebview.cpp | |
| parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
| download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz | |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit/qt/Api/qwebview.cpp')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebview.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Source/WebKit/qt/Api/qwebview.cpp b/Source/WebKit/qt/Api/qwebview.cpp index a6082cf63..f90790f0c 100644 --- a/Source/WebKit/qt/Api/qwebview.cpp +++ b/Source/WebKit/qt/Api/qwebview.cpp @@ -34,10 +34,8 @@ #include "qdir.h" #include "qfile.h" #ifndef QT_NO_ACCESSIBILITY -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #include "qwebviewaccessible_p.h" #endif -#endif class QWebViewPrivate { public: @@ -154,7 +152,6 @@ void QWebViewPrivate::_q_pageDestroyed() */ #ifndef QT_NO_ACCESSIBILITY -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) static QAccessibleInterface* accessibleInterfaceFactory(const QString& key, QObject* object) { Q_UNUSED(key) @@ -168,7 +165,6 @@ static QAccessibleInterface* accessibleInterfaceFactory(const QString& key, QObj return 0; } #endif -#endif /*! Constructs an empty QWebView with parent \a parent. @@ -191,10 +187,8 @@ QWebView::QWebView(QWidget *parent) setFocusPolicy(Qt::WheelFocus); #ifndef QT_NO_ACCESSIBILITY -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) QAccessible::installFactory(accessibleInterfaceFactory); #endif -#endif } /*! @@ -732,9 +726,7 @@ bool QWebView::event(QEvent *e) } else if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchUpdate -#if HAVE(QT5) || e->type() == QEvent::TouchCancel -#endif ) { d->page->event(e); |