diff --git a/oscar/welcome.cpp b/oscar/welcome.cpp index efd82ae0..7a669232 100644 --- a/oscar/welcome.cpp +++ b/oscar/welcome.cpp @@ -7,6 +7,9 @@ * License. See the file COPYING in the main directory of Source Code. */ #include +// remember to turn test_macros off for release. +#define TEST_MACROS_ENABLEDoff +#include #include "welcome.h" #include "ui_welcome.h" @@ -151,9 +154,10 @@ QString Welcome::GenerateCPAPHTML() "p,a,td,body { font-family: '"+QApplication::font().family()+"'; }" "p,a,td,body { font-size: "+QString::number(QApplication::font().pointSize() + 2)+"px; }" "" - "" + ""; + html += "" ; Machine * cpap = nullptr; if (!havecpapdata && !haveoximeterdata) { @@ -170,7 +174,6 @@ QString Welcome::GenerateCPAPHTML() } if (day && (cpap != nullptr)) { QString cpapimage = cpap->getPixmapPath(); - ui->cpapIcon->setPixmap(QPixmap(cpapimage)); html+= ""+tr("The last time you used your %1...").arg(cpap->brand()+" "+cpap->model())+"
"; @@ -360,7 +363,9 @@ QString Welcome::GenerateOxiHTML() "p,a,td,body { font-size: "+QString::number(QApplication::font().pointSize() + 2)+"px; }" "" "" + ""; + html += "" ; if (haveoximeterdata) { QDate oxidate=p_profile->LastDay(MT_OXIMETER);