summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2017-03-10 18:55:56 +0100
committerMarc Mutz <marc.mutz@kdab.com>2017-03-10 18:14:12 +0000
commit5a249af4e4ba392904bc7b0f3e103bb87ad540f6 (patch)
tree2bfaec137a1e964d3e277da878546fe911e1311b
parent40cc6dea5b1b5d2570468adcc83943f8c8bd112e (diff)
downloadqtwebkit-5a249af4e4ba392904bc7b0f3e103bb87ad540f6.tar.gz
Remove uses of QString::null
It's going to be deprecated. Change-Id: I2cc901cd2b66330b1beca16c865b6259c3bab949 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
-rw-r--r--Source/WebKit/qt/WidgetApi/qwebpage.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp
index 60e4d8b7b..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;
}
@@ -3209,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
}