From fe13d33907764a03571d10acbc17fb2ac5c83de7 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Wed, 5 Feb 2014 17:04:08 +0100
Subject: [PATCH] QNX: Fix compilation with Qt 4.
Introduced by b254313c686d07057acba243198100e49159e6e5 .
Change-Id: Ib1b41da58eef97f5fe961ca12bcfcabeae4fd523
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
src/plugins/qnx/bardescriptordocument.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qnx/bardescriptordocument.cpp b/src/plugins/qnx/bardescriptordocument.cpp
index 92b80f06f8b..481465f1f12 100644
--- a/src/plugins/qnx/bardescriptordocument.cpp
+++ b/src/plugins/qnx/bardescriptordocument.cpp
@@ -620,9 +620,8 @@ int BarDescriptorDocument::tagForElement(const QDomElement &element)
QMetaEnum tags = metaObject()->enumerator(metaObject()->enumeratorOffset());
QDomElement el = element;
while (!el.isNull()) {
- bool ok;
- int n = tags.keyToValue(el.tagName().toLatin1().constData(), &ok);
- if (ok)
+ const int n = tags.keyToValue(el.tagName().toLatin1().constData());
+ if (n > -1)
return n;
el = el.parentNode().toElement();
}
--
GitLab