diff options
Diffstat (limited to 'Source/WebKit/qt/WidgetApi/qwebpage.cpp')
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebpage.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp index 388456616..1f828a7ad 100644 --- a/Source/WebKit/qt/WidgetApi/qwebpage.cpp +++ b/Source/WebKit/qt/WidgetApi/qwebpage.cpp @@ -3134,7 +3134,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; } @@ -3182,7 +3182,8 @@ QWebPageAdapter *QWebPage::handle() const */ bool QWebPage::findText(const QString &subString, FindFlags options) { - return d->findText(subString, static_cast<QWebPageAdapter::FindFlag>(options.operator int())); + return d->findText(subString, static_cast<QWebPageAdapter::FindFlag>( + static_cast<FindFlags::Int>(options))); } /*! @@ -3208,9 +3209,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 } |