Merge branch 'master' into apa-bits

This commit is contained in:
fourtf
2019-09-08 18:02:58 +02:00
committed by GitHub
94 changed files with 1178 additions and 1640 deletions
+1 -1
View File
@@ -461,4 +461,4 @@ git_hash = $$str_member($$git_commit, 0, 8)
# https://stackoverflow.com/questions/3348711/add-a-define-to-qmake-with-a-value/18343449#18343449
DEFINES += CHATTERINO_GIT_COMMIT=\\\"$$git_commit\\\"
DEFINES += CHATTERINO_GIT_RELEASE=\\\"$$git_release\\\"
DEFINES += CHATTERINO_GIT_HASH=\\\"$$git_hash\\\"
DEFINES += CHATTERINO_GIT_HASH=\\\"$$git_hash\\\"