summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@digia.com>2014-03-28 13:27:18 +0200
committerSamuli Piippo <samuli.piippo@digia.com>2014-04-03 10:17:56 +0300
commit8dc84db6555d4fbf131b2191bb8b02bbb56a9a82 (patch)
tree813ab0ef8142cd40881465dd4a52d89534c3685f
parent9939d72b1e2f67a7af52cc798ae4fd9742d086f6 (diff)
sensorexplorer: Use identifier field when description is empty
Dummy sensors do not have description set, so they show up empty in the sensorexplorer. Use identifier in those cases. Task-number: QTEE-245 Change-Id: Iad160ddccde12124e1c293bb9894870ca4ab7ab9 Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
-rw-r--r--basicsuite/sensorexplorer/imports/sensoritem.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/basicsuite/sensorexplorer/imports/sensoritem.cpp b/basicsuite/sensorexplorer/imports/sensoritem.cpp
index cd33549..2a64d6c 100644
--- a/basicsuite/sensorexplorer/imports/sensoritem.cpp
+++ b/basicsuite/sensorexplorer/imports/sensoritem.cpp
@@ -101,7 +101,7 @@ void QSensorItem::setStart(bool run)
*/
QString QSensorItem::id()
{
- return (_qsensor ? _qsensor->description() : "");
+ return (_qsensor ? (!_qsensor->description().isEmpty() ? _qsensor->description() : _qsensor->identifier()) : "");
}
/*