chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into import-date-fix

Browse Source
This commit is contained in:
kappa44 2021-05-18 20:45:27 +10:00
commit fc5cfc2a9b
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
oscar/oscar.pro
View File

@ -493,18 +493,26 @@ DISTFILES += help/default.css \
QMAKE_CFLAGS += -Werror QMAKE_CFLAGS += -Werror
QMAKE_CXXFLAGS += -Werror QMAKE_CXXFLAGS += -Werror
gcc | clang { gcc | clang {
COMPILER_VERSION = $$system($$QMAKE_CXX " -dumpversion") COMPILER_VERSION = $$system($$QMAKE_CXX " -dumpversion")
COMPILER_MAJOR = $$str_member($$COMPILER_VERSION) COMPILER_MAJOR = $$split(COMPILER_VERSION, ".")
greaterThan(COMPILER_MAJOR, 9) : { COMPILER_MAJOR = $$first(COMPILER_MAJOR)
QMAKE_CFLAGS += -Wno-error=depreciated-copy
QMAKE_CXX_FLAGS += -Wno-error=depreciated-copy message("$$QMAKE_CXX major version $$COMPILER_MAJOR")
message("Removing depreciated-copy error")
greaterThan(COMPILER_MAJOR, 10) : {
QMAKE_CFLAGS += -Wno-error=stringop-overread
QMAKE_CXXFLAGS += -Wno-error=stringop-overread
message("Removing stringop-overread error")
} }
} }
# Make deprecation warnings just warnings # Make deprecation warnings just warnings
QMAKE_CFLAGS += -Wno-error=deprecated-declarations QMAKE_CFLAGS += -Wno-error=deprecated-declarations
QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations
lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) { lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) {
QMAKE_CFLAGS += -Wno-error=strict-aliasing QMAKE_CFLAGS += -Wno-error=strict-aliasing
QMAKE_CXXFLAGS += -Wno-error=strict-aliasing QMAKE_CXXFLAGS += -Wno-error=strict-aliasing

2
oscar/oximeterimport.cpp
View File

@ -407,7 +407,7 @@ void OximeterImport::on_fileImportButton_clicked()
if (documentsFolder.isEmpty()) if (documentsFolder.isEmpty())
documentsFolder = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation); documentsFolder = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
qDebug() << "oximod - File Import button clicked"; qDebug() << "oximod - File Import button clicked";
QString filename = QFileDialog::getOpenFileName(nullptr , tr("Select a valid oximetry data file"), documentsFolder, tr("Oximetry Files (*.spo *.spor *.spo2 *.SpO2 *.dat)")); QString filename = QFileDialog::getOpenFileName(nullptr , tr("Select a valid oximetry data file"), documentsFolder, tr("Oximetry Files (*.spo *.spor *.spo2 *.SpO2 *.dat)"));