From c3473c89fe66e32a36815e969f81480562d8ce12 Mon Sep 17 00:00:00 2001 From: Thomas McGuire Date: Mon, 1 Oct 2012 11:21:07 +0200 Subject: 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 --- src/plugins/platforms/blackberry/qbbbuttoneventnotifier.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 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; } -- cgit v0.12