Index: denali.pro =================================================================== diff -u -ra0abaaf1ca5aba5da46b0710ce0689f39b02dce9 -r909090c5bae8b2fcc9aed6c2b55078b4f3d26fdd --- denali.pro (.../denali.pro) (revision a0abaaf1ca5aba5da46b0710ce0689f39b02dce9) +++ denali.pro (.../denali.pro) (revision 909090c5bae8b2fcc9aed6c2b55078b4f3d26fdd) @@ -132,6 +132,7 @@ VER_MINOR="4" \ VER_REVIS="\\\"${buildNumber}\\\"" \ VER_DEVEL=\\\"$$system( date "+%m%d%H%M" )\\\" + VER_APPLY=\\\"$$system( touch -m main.cpp)\\\" CodeCoverage { message(Building with Squish Coco) Index: sources/gui/qml/components/NotificationBar.qml =================================================================== diff -u -r6cf864fa54afe656a17daf797b2e2c130dfea90e -r909090c5bae8b2fcc9aed6c2b55078b4f3d26fdd --- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 6cf864fa54afe656a17daf797b2e2c130dfea90e) +++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 909090c5bae8b2fcc9aed6c2b55078b4f3d26fdd) @@ -21,6 +21,7 @@ import "qrc:/globals" Rectangle { id: _root + objectName: "NotificationBar" property alias text : _text.text property int level : 0 Index: sources/storage/logger.cpp =================================================================== diff -u -r637a35ebe0557ab5ec7336fe4bd032f680611baf -r909090c5bae8b2fcc9aed6c2b55078b4f3d26fdd --- sources/storage/logger.cpp (.../logger.cpp) (revision 637a35ebe0557ab5ec7336fe4bd032f680611baf) +++ sources/storage/logger.cpp (.../logger.cpp) (revision 909090c5bae8b2fcc9aed6c2b55078b4f3d26fdd) @@ -270,7 +270,6 @@ QString mDestination = Storage::USB_Mount_Point; QFuture future = QtConcurrent::run(&FileHandler::copyFolder, mSource, mDestination); _exportWatcher.setFuture(future); - future.waitForFinished(); return true; } // coco end Index: sources/view/valarmstatus.cpp =================================================================== diff -u -r31b9ae63410e7ca23f0f849e38368880e4c402b4 -r909090c5bae8b2fcc9aed6c2b55078b4f3d26fdd --- sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision 31b9ae63410e7ca23f0f849e38368880e4c402b4) +++ sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision 909090c5bae8b2fcc9aed6c2b55078b4f3d26fdd) @@ -13,6 +13,8 @@ */ #include "valarmstatus.h" +// Qt + // Project #include "guicontroller.h" @@ -53,7 +55,11 @@ // it returns the enum name for now const QMetaObject *mo = qt_getEnumMetaObject(vEnum); int enumIdx = mo->indexOfEnumerator(qt_getEnumName(vEnum)); - return mo->enumerator(enumIdx).valueToKey(vEnum); + const char *key = mo->enumerator(enumIdx).valueToKey(vEnum); + if (key) + return qPrintable(key); + else + return QString("ALARM_ID_UNDEFINED [%1]").arg(vEnum); } /*! @@ -71,7 +77,11 @@ // it returns the enum name for now const QMetaObject *mo = qt_getEnumMetaObject(vEnum); int enumIdx = mo->indexOfEnumerator(qt_getEnumName(vEnum)); - return mo->enumerator(enumIdx).valueToKey(vEnum); + const char *key = mo->enumerator(enumIdx).valueToKey(vEnum); + if (key) + return qPrintable(key); + else + return QString("ALARM_ID_UNDEFINED [%1]").arg(vEnum); } QString View::VAlarmStatus::text()