Merge branch 'master' into feature/bandwidth-hotconf

BatchDrake · Aug 19, 2019 · ea65fd6 · ea65fd6
2 parents 2b86b33 + 286b1d2
commit ea65fd6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/SigDigger.pro b/SigDigger.pro
@@ -22,7 +22,12 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
-CONFIG += c++14
+equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 9) {
+  QMAKE_CXXFLAGS += -std=gnu++14
+} else {
+  CONFIG += c++14
+}
+
 INCLUDEPATH += $$PWD/include /usr/include/SuWidgets
 SOURCES += \
     App/AppConfig.cpp \

diff --git a/include/Suscan/Compat.h b/include/Suscan/Compat.h
@@ -22,6 +22,7 @@
 
 #include <stdexcept>
 #include <memory>
+#include <cmath>
 #include <sigutils/types.h>
 
 #define SU_ATTEMPT(expr)     \

diff --git a/include/Suscan/Logger.h b/include/Suscan/Logger.h
@@ -23,6 +23,7 @@
 #include <vector>
 #include <mutex>
 
+#include <Suscan/Compat.h>
 #include <sigutils/log.h>
 
 namespace Suscan {