mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-05 02:30:44 +00:00
Merge branch 'master' into import-date-fix
This commit is contained in:
commit
fc5cfc2a9b
@ -493,18 +493,26 @@ DISTFILES += help/default.css \
|
||||
QMAKE_CFLAGS += -Werror
|
||||
QMAKE_CXXFLAGS += -Werror
|
||||
|
||||
|
||||
gcc | clang {
|
||||
COMPILER_VERSION = $$system($$QMAKE_CXX " -dumpversion")
|
||||
COMPILER_MAJOR = $$str_member($$COMPILER_VERSION)
|
||||
greaterThan(COMPILER_MAJOR, 9) : {
|
||||
QMAKE_CFLAGS += -Wno-error=depreciated-copy
|
||||
QMAKE_CXX_FLAGS += -Wno-error=depreciated-copy
|
||||
message("Removing depreciated-copy error")
|
||||
COMPILER_MAJOR = $$split(COMPILER_VERSION, ".")
|
||||
COMPILER_MAJOR = $$first(COMPILER_MAJOR)
|
||||
|
||||
message("$$QMAKE_CXX major version $$COMPILER_MAJOR")
|
||||
|
||||
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
|
||||
QMAKE_CFLAGS += -Wno-error=deprecated-declarations
|
||||
QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations
|
||||
|
||||
lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) {
|
||||
QMAKE_CFLAGS += -Wno-error=strict-aliasing
|
||||
QMAKE_CXXFLAGS += -Wno-error=strict-aliasing
|
||||
|
@ -407,7 +407,7 @@ void OximeterImport::on_fileImportButton_clicked()
|
||||
if (documentsFolder.isEmpty())
|
||||
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)"));
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user