diff options
| author | Thomas McGuire <thomas.mcguire.qnx@kdab.com> | 2012-10-01 09:21:07 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-02 08:41:28 (GMT) |
| commit | c3473c89fe66e32a36815e969f81480562d8ce12 (patch) | |
| tree | 77e1b80db90aae9e1ea0abbaabf65906db364a77 | |
| parent | b73bd156ae5bc72c199d9313696a8701f76689d5 (diff) | |
| download | Qt-c3473c89fe66e32a36815e969f81480562d8ce12.zip Qt-c3473c89fe66e32a36815e969f81480562d8ce12.tar.gz Qt-c3473c89fe66e32a36815e969f81480562d8ce12.tar.bz2 | |
Blackberry: Fix hardware button detection on the BB Dev Alpha
The format of the PPS object has changed, it is now prefixed with
[n], so be more leninent in parsing to support both formats.
This is a backport of
qtbase commit fda3fac1d276952ddac4f5a916339db1940082d5
Change-Id: Ibb9b2bef150ca184e2bb234e55e04975552f10b1
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | src/plugins/platforms/blackberry/qbbbuttoneventnotifier.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/blackberry/qbbbuttoneventnotifier.cpp b/src/plugins/platforms/blackberry/qbbbuttoneventnotifier.cpp index afbc266..ab41b36 100644 --- a/src/plugins/platforms/blackberry/qbbbuttoneventnotifier.cpp +++ b/src/plugins/platforms/blackberry/qbbbuttoneventnotifier.cpp @@ -194,7 +194,7 @@ bool QBBButtonEventNotifier::parsePPS(const QByteArray &ppsData, QHash<QByteArra QList<QByteArray> lines = ppsData.split('\n'); // validate pps object - if (lines.size() == 0 || lines.at(0) != QByteArray("@status")) { + if (lines.size() == 0 || !lines.at(0).contains(QByteArray("@status"))) { qWarning("QQNX: unrecognized pps object, data=%s", ppsData.constData()); return false; } |