AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BlackBerry: Repair the file picker

Browse Source 
The interface for invoking the file dialog has been changed. Instead of a Json object we now
passing a pps object to the invoke target.

Change-Id: I3c5bc8f0e1af1a84d4afb6bc1923f23db2b43d5e
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
This commit is contained in:
Fabian Bumberger 2014-03-07 11:54:26 +01:00 committed by The Qt Project
parent d42b8a22ff
commit 7591abbe04
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,7 @@
#include <QJsonArray>
#include <QJsonParseError>
#include <QUrl>
#include <private/qppsobject_p.h>
#include <bps/navigator.h>
#include <bps/navigator_invoke.h>
@ -132,11 +133,16 @@ void QQnxFilePicker::open()
if (!m_filters.isEmpty())
map[QStringLiteral("Filter")] = m_filters.join(";");
QByteArray ppsData;
#if defined(Q_OS_BLACKBERRY_TABLET)
QJsonDocument document;
document.setObject(QJsonObject::fromVariantMap(map));
const QByteArray jsonData = document.toJson(QJsonDocument::Compact);
ppsData = document.toJson(QJsonDocument::Compact);
#else
ppsData = QPpsObject::encode(map);
#endif
errorCode = navigator_invoke_invocation_set_data(m_invocationHandle, jsonData.constData(), jsonData.size());
errorCode = navigator_invoke_invocation_set_data(m_invocationHandle, ppsData.constData(), ppsData.size());
if (errorCode != BPS_SUCCESS) {
cleanup();
qWarning() << "QQnxFilePicker: unable to set data:" << strerror(errno);