Index: denali.pro =================================================================== diff -u -re02b2d465b145702dc41965b2e7da154857eea75 -r805119c460b4a266d6401c8705f4427e7fbe270f --- denali.pro (.../denali.pro) (revision e02b2d465b145702dc41965b2e7da154857eea75) +++ denali.pro (.../denali.pro) (revision 805119c460b4a266d6401c8705f4427e7fbe270f) @@ -1,4 +1,4 @@ -QT += widgets qml quick serialbus +QT += widgets qml quick serialbus concurrent CONFIG += c++17 warn_on QMAKE_CXXFLAGS += -Wall -Werror @@ -38,20 +38,21 @@ sources/applicationpost.h \ sources/canbus/caninterface.h \ sources/canbus/frameinterface.h \ + sources/canbus/messageacknowmodel.h \ sources/canbus/messagebuilder.h \ sources/canbus/messagedispatcher.h \ sources/canbus/messageglobals.h \ sources/canbus/messageinterpreter.h \ - sources/configuration/display.h \ - sources/configuration/sound.h \ +# sources/configuration/display.h \ +# sources/configuration/sound.h \ sources/gui/guiglobals.h \ sources/gui/guiview.h \ sources/gui/guicontroller.h \ sources/main.h \ sources/maintimer.h \ sources/storage/filehandler.h \ sources/storage/logger.h \ - sources/storage/settings.h \ +# sources/storage/settings.h \ sources/storage/storageglobals.h \ sources/storage/usbwatcher.h \ sources/threads.h \ @@ -65,18 +66,19 @@ sources/applicationpost.cpp \ sources/canbus/caninterface.cpp \ sources/canbus/frameinterface.cpp \ + sources/canbus/messageacknowmodel.cpp \ sources/canbus/messagebuilder.cpp \ sources/canbus/messagedispatcher.cpp \ sources/canbus/messageinterpreter.cpp \ - sources/configuration/display.cpp \ - sources/configuration/sound.cpp \ +# sources/configuration/display.cpp \ +# sources/configuration/sound.cpp \ sources/gui/guiglobals.cpp \ sources/gui/guiview.cpp \ sources/gui/guicontroller.cpp \ sources/maintimer.cpp \ sources/storage/filehandler.cpp \ sources/storage/logger.cpp \ - sources/storage/settings.cpp \ +# sources/storage/settings.cpp \ sources/storage/storageglobals.cpp \ sources/storage/usbwatcher.cpp \ sources/threads.cpp \ @@ -106,6 +108,7 @@ QMAKE_CFLAGS += $$COVERAGE_OPTIONS QMAKE_CXXFLAGS += $$COVERAGE_OPTIONS QMAKE_LFLAGS += $$COVERAGE_OPTIONS + DEFINES += SQUISH_COCO_BULD } tst_canbus { @@ -144,6 +147,18 @@ unittests/tst_utilities.cpp } +tst_acknow { + message(Building with QtTest test case acknow) + QT += testlib + DEFINES += UNIT_TEST \ + TEST_CLASS_INCLUDE=\\\"unittests/tst_acknow.h\\\" \ + TEST_CLASS_NAME=tst_acknow + HEADERS += \ + unittests/tst_acknow.h + SOURCES += \ + unittests/tst_acknow.cpp +} + # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH =