diff options
author | Fabian Bumberger <fbumberger@rim.com> | 2014-03-07 11:54:26 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-08 11:45:06 +0100 |
commit | 7591abbe0402d7fcb6305728c1456c1e148d1c40 (patch) | |
tree | 219669142250398698a1e7665f96697d3443856d /src/plugins/platforms/qnx | |
parent | d42b8a22ff8e201166ea3c3ac0bb3e43a615a5d3 (diff) |
BlackBerry: Repair the file picker
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>
Diffstat (limited to 'src/plugins/platforms/qnx')
-rw-r--r-- | src/plugins/platforms/qnx/qqnxfilepicker.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/platforms/qnx/qqnxfilepicker.cpp b/src/plugins/platforms/qnx/qqnxfilepicker.cpp index 56c804a5b4..843b035037 100644 --- a/src/plugins/platforms/qnx/qqnxfilepicker.cpp +++ b/src/plugins/platforms/qnx/qqnxfilepicker.cpp @@ -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); |