diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-03-26 13:55:39 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-03-26 18:56:55 +0000 |
| commit | eaaf1391d58f17bde794d6c8634e092209898941 (patch) | |
| tree | ff3702a6509dc9333ffd7515cf078cf69478fcc3 /Source/WebKit/qt/WidgetApi/qwebpage.cpp | |
| parent | fdcba363c7e7e01790ba4b946e4f53f8600d8a20 (diff) | |
Import WebKit commit 17e8bfb1ff30314a838b9bf641c112f63a11dba4
Change-Id: Ib6549e44a04300c7b7b07ddc9094b823b37f3183
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit/qt/WidgetApi/qwebpage.cpp')
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebpage.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp index 009842830..5bb2f315d 100644 --- a/Source/WebKit/qt/WidgetApi/qwebpage.cpp +++ b/Source/WebKit/qt/WidgetApi/qwebpage.cpp @@ -31,6 +31,7 @@ #include "QtFallbackWebPopup.h" #include "QtPlatformPlugin.h" #include "UndoStepQt.h" +#include "WebEventConversion.h" #include "qwebframe.h" #include "qwebframe_p.h" @@ -48,7 +49,6 @@ #include <QBitArray> #include <QClipboard> #include <QColorDialog> -#include <QDebug> #include <QDesktopWidget> #include <QDragEnterEvent> #include <QDragLeaveEvent> @@ -976,7 +976,7 @@ bool QWebPagePrivate::gestureEvent(QGestureEvent* event) return false; // QGestureEvents can contain updates for multiple gestures. bool handled = false; -#if ENABLE(GESTURE_EVENTS) +#if ENABLE(QT_GESTURE_EVENTS) // QGestureEvent lives in Widgets, we'll need a dummy struct to mule the info it contains to the "other side" QGestureEventFacade gestureFacade; @@ -1000,7 +1000,7 @@ bool QWebPagePrivate::gestureEvent(QGestureEvent* event) frame->handleGestureEvent(&gestureFacade); handled = true; } -#endif // ENABLE(GESTURE_EVENTS) +#endif // ENABLE(QT_GESTURE_EVENTS) event->setAccepted(handled); return handled; @@ -3064,7 +3064,7 @@ bool QWebPage::extension(Extension extension, const ExtensionOption *option, Ext if (extension == ChooseMultipleFilesExtension) { // FIXME: do not ignore suggestedFiles QStringList suggestedFiles = static_cast<const ChooseMultipleFilesExtensionOption*>(option)->suggestedFileNames; - QStringList names = QFileDialog::getOpenFileNames(view(), QString::null); + QStringList names = QFileDialog::getOpenFileNames(view(), QString()); static_cast<ChooseMultipleFilesExtensionReturn*>(output)->fileNames = names; return true; } @@ -3139,9 +3139,9 @@ QString QWebPage::chooseFile(QWebFrame *parentFrame, const QString& suggestedFil { Q_UNUSED(parentFrame); #ifndef QT_NO_FILEDIALOG - return QFileDialog::getOpenFileName(view(), QString::null, suggestedFile); + return QFileDialog::getOpenFileName(view(), QString(), suggestedFile); #else - return QString::null; + return QString(); #endif } |