1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNX: Fix filenames returned by the file dialog.

Browse Source 
QUrl prefixes like file:// should be used. QFileDialog will use
QFileInfo later on, and that doesn't support QUrl prefixes.

Change-Id: I8f6d2fb9a4f502cff030a1cdd43b047b8ed5a120
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
This commit is contained in:
Sergio Martins 2013-04-16 09:42:41 +01:00 committed by The Qt Project
parent 92d8e7c315
commit 893deb1a93
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/platforms/qnx/qqnxfilepicker.cpp
View File

@ -48,6 +48,7 @@
#include <QJsonObject>
#include <QJsonArray>
#include <QJsonParseError>
#include <QUrl>
#include <bps/navigator.h>
#include <bps/navigator_invoke.h>
@ -258,12 +259,13 @@ void QQnxFilePicker::handleFilePickerResponse(const char *data)
foreach (const QVariant &variant, array) {
const QJsonObject object = QJsonObject::fromVariantMap(variant.toMap());
const QString uri = object.value(QStringLiteral("uri")).toString();
const QUrl url(object.value(QStringLiteral("uri")).toString());
const QString localFile = url.toLocalFile(); // strip "file://"
if (!uri.isEmpty())
m_selectedFiles << uri;
if (!localFile.isEmpty())
m_selectedFiles << localFile;
qFilePickerDebug() << "FilePicker uri response:" << uri;
qFilePickerDebug() << "FilePicker uri response:" << localFile;
}
Q_EMIT closed();