Merge branch 'master' into update-win-builds

This commit is contained in:
username223
2019-01-04 20:56:39 +01:00
committed by GitHub
8 changed files with 146 additions and 40 deletions
+1 -1
View File
@@ -5,7 +5,7 @@
#-------------------------------------------------
QT += core gui qml quick multimedia widgets
CONFIG += c++11
CONFIG += c++14
DEFINES += ELPP_THREAD_SAFE ELPP_QT_LOGGING ELPP_NO_DEFAULT_LOG_FILE