Merge PR #419: Disable deprecation errors to allow building with gcc 10/Qt 5.15
This commit is contained in:
commit
fa7e03f541
@ -31,7 +31,7 @@ CONFIG += plugin link_pkgconfig
|
|||||||
|
|
||||||
PKGCONFIG += nymea
|
PKGCONFIG += nymea
|
||||||
|
|
||||||
QMAKE_CXXFLAGS *= -Werror -std=c++11 -g
|
QMAKE_CXXFLAGS *= -Werror -std=c++11 -g -Wno-deprecated-declarations
|
||||||
QMAKE_LFLAGS *= -std=c++11 -z defs
|
QMAKE_LFLAGS *= -std=c++11 -z defs
|
||||||
|
|
||||||
JSONFILE=$${_PRO_FILE_PWD_}/integrationplugin"$$TARGET".json
|
JSONFILE=$${_PRO_FILE_PWD_}/integrationplugin"$$TARGET".json
|
||||||
|
|||||||
@ -3,7 +3,7 @@ COPYRIGHT_YEAR_TO=2021
|
|||||||
|
|
||||||
DEFINES += COPYRIGHT_YEAR_STRING=\\\"$${COPYRIGHT_YEAR_FROM}-$${COPYRIGHT_YEAR_TO}\\\"
|
DEFINES += COPYRIGHT_YEAR_STRING=\\\"$${COPYRIGHT_YEAR_FROM}-$${COPYRIGHT_YEAR_TO}\\\"
|
||||||
|
|
||||||
QMAKE_CXXFLAGS *= -Werror -std=c++11 -g
|
QMAKE_CXXFLAGS *= -Werror -std=c++11 -g -Wno-deprecated-declarations
|
||||||
QMAKE_LFLAGS *= -std=c++11
|
QMAKE_LFLAGS *= -std=c++11
|
||||||
|
|
||||||
top_srcdir=$$PWD
|
top_srcdir=$$PWD
|
||||||
|
|||||||
Reference in New Issue
Block a user