Index: denali.pro
===================================================================
diff -u -rc8de9dc4cb679628ac9c0c9551bc43ad3c415d4a -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4
--- denali.pro	(.../denali.pro)	(revision c8de9dc4cb679628ac9c0c9551bc43ad3c415d4a)
+++ denali.pro	(.../denali.pro)	(revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4)
@@ -14,6 +14,20 @@
     DEFINES += DISABLE_KEEP_ALIVE
 }
 
+# added this section to detect which compiler is running
+# to decide device dependent decisions
+# by defining a MACRO
+# and use that MACRO for conditional build
+message($$QMAKESPEC)
+linux-g++ {
+    message(Linux.g++)
+    DEFINES += BUILD_FOR_GCC
+}
+linux-oe-generic-g++ {
+    message(Linux.poky)
+    DEFINES += BUILD_FOR_POKY
+}
+
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings
 # depend on your compiler). Refer to the documentation for the
@@ -34,12 +48,14 @@
     sources/utility \
     sources/abstract \
     sources/model \
+    sources/model/settings \
     sources/model/hd/adjustment \
     sources/model/hd/alarm \
     sources/model/hd/data \
     sources/model/dg/data \
     sources/model/dg/adjustment \
     sources/view \
+    sources/view/settings \
     sources/view/hd/adjustment \
     sources/view/hd/alarm \
     sources/view/hd/data \
@@ -61,10 +77,9 @@
     sources/ApplicationController.h \
     \ # ---------- Models ----------
     sources/model/MModel.h \
-    #sources/model/MAbstractProgressData.h \
     sources/model/MAbstract.h \
-    sources/model/MDGDebugText.h \
-    sources/model/MHDDebugText.h \
+    \ # ---------- Models - settings
+    sources/model/settings/MSettings.h \
     \ # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmStatusData.h \
     sources/model/hd/alarm/MAlarmTriggered.h \
@@ -107,6 +122,7 @@
     sources/model/hd/data/MPreTreatmentSelfTestDryData.h \
     sources/model/hd/data/MPreTreatmentDisposablesPrimeData.h \
     \ # ---------- Models - HD - Data
+    sources/model/hd/data/MHDDebugText.h \
     sources/model/hd/data/MHDAccelerometerData.h \
     sources/model/hd/data/MTreatmentTimeData.h \
     sources/model/hd/data/MTreatmentFlowsData.h \
@@ -123,6 +139,7 @@
     \ # ---------- Models - DG - Data - Pre-Treatment - Progress
     sources/model/dg/data/MDGFilterFlushData.h \
     \ # ---------- Models - DG - Data
+    sources/model/dg/data/MDGDebugText.h \
     sources/model/dg/data/MDGDrainPumpData.h \
     sources/model/dg/data/MDGHeatersData.h \
     sources/model/dg/data/MDGLoadCellReadingsData.h \
@@ -147,6 +164,7 @@
     sources/gui/GuiView.h \
     sources/gui/GuiController.h \
     \ # ---------- Views ----------
+    sources/storage/Settings.h \
     sources/view/VTreatmentCreate.h \
     sources/view/VEventSpy.h \
     sources/view/VView.h \
@@ -222,7 +240,8 @@
     \ # Utility
     sources/utility/crc.h \
     sources/utility/format.h \
-    sources/utility/types.h
+    sources/utility/types.h \
+    sources/view/settings/VSettings.h
 #    sources/configuration/display.h \
 #    sources/configuration/sound.h \
 #    sources/storage/settings.h \
@@ -239,9 +258,8 @@
     sources/ApplicationController.cpp \
     \ # ---------- Models ----------
     sources/model/MAbstract.cpp \
-#    sources/model/MAbstractProgressData.cpp \
-    sources/model/MHDDebugText.cpp \
-    sources/model/MDGDebugText.cpp \
+    \ # ---------- Models - settings
+    sources/model/settings/MSettings.cpp \
     \ # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmStatusData.cpp \
     sources/model/hd/alarm/MAlarmTriggered.cpp \
@@ -282,6 +300,7 @@
     sources/model/hd/data/MPreTreatmentStatesData.cpp \
     sources/model/hd/data/MTreatmentStatesData.cpp \
     \ # ---------- Models - HD - Data
+    sources/model/hd/data/MHDDebugText.cpp \
     sources/model/hd/data/MHDAccelerometerData.cpp \
     sources/model/hd/data/MTreatmentTimeData.cpp \
     sources/model/hd/data/MTreatmentFlowsData.cpp \
@@ -298,6 +317,7 @@
     \ # ---------- Models - DG - Data - Pre-Treatment - Progress
     sources/model/dg/data/MDGFilterFlushData.cpp \
     \ # ---------- Models - DG - Data
+    sources/model/dg/data/MDGDebugText.cpp \
     sources/model/dg/data/MDGDrainPumpData.cpp \
     sources/model/dg/data/MDGHeatersData.cpp \
     sources/model/dg/data/MDGLoadCellReadingsData.cpp \
@@ -321,6 +341,7 @@
     sources/gui/GuiView.cpp \
     sources/gui/GuiController.cpp \
     \ # ---------- Views ----------
+    sources/storage/Settings.cpp \
     sources/view/VTreatmentCreate.cpp \
     sources/view/VEventSpy.cpp \
     sources/view/VPowerOff.cpp \
@@ -397,7 +418,8 @@
     \ # Utility
     sources/utility/crc.cpp \
     sources/utility/format.cpp \
-    sources/utility/types.cpp
+    sources/utility/types.cpp \
+    sources/view/settings/VSettings.cpp
 
 
 RESOURCES += \