diff options
| author | Sergio Martins <sergio.martins@kdab.com> | 2014-02-08 18:17:09 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-09 00:18:49 +0100 |
| commit | 01614b1d9ab60057bb98a6f740dbfa16f2636060 (patch) | |
| tree | 6af84a7b31ccd7185ceb465925293b238d48bfca | |
| parent | 3f9bd69da1ac2f70158849d5f1b4b464d0488e0e (diff) | |
| download | qtwebkit-01614b1d9ab60057bb98a6f740dbfa16f2636060.tar.gz | |
Fix build with QT_NO_GRAPHICSVIEW
Change-Id: Ia909a560db58d6cdc6ec4bbac879249eb5e286ef
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebpage.cpp | 2 | ||||
| -rw-r--r-- | Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp index cb9559e33..05caf7134 100644 --- a/Source/WebKit/qt/WidgetApi/qwebpage.cpp +++ b/Source/WebKit/qt/WidgetApi/qwebpage.cpp @@ -438,8 +438,10 @@ QtPluginWidgetAdapter *QWebPagePrivate::adapterForWidget(QObject *object) const { if (QWidget *widget = qobject_cast<QWidget*>(object)) return new QWidgetPluginImpl(widget); +#ifndef QT_NO_GRAPHICSVIEW if (QGraphicsWidget *widget = qobject_cast<QGraphicsWidget*>(object)) return new QGraphicsWidgetPluginImpl(widget); +#endif return 0; } diff --git a/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp b/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp index b2fbf624a..5bf90d800 100644 --- a/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp +++ b/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp @@ -58,10 +58,14 @@ void QtFallbackWebPopup::show(const QWebSelectData& data) populate(data); QRect rect = geometry(); +#ifdef QT_NO_GRAPHICSVIEW + if (false) { +#else if (QGraphicsWebView *webView = qobject_cast<QGraphicsWebView*>(pageClient()->pluginParent())) { QGraphicsProxyWidget* proxy = new QGraphicsProxyWidget(webView); proxy->setWidget(m_combo); proxy->setGeometry(rect); +#endif } else { m_combo->setParent(qobject_cast<QWidget*>(pageClient()->ownerWidget())); m_combo->setGeometry(QRect(rect.left(), rect.top(), rect.width(), m_combo->sizeHint().height())); |