Merge branch 'develop' into feature/Extract_Designer_to_plugin

This commit is contained in:
Arin Alexander
2017-12-11 14:53:41 +03:00
14 changed files with 3676 additions and 75 deletions

View File

@@ -90,7 +90,7 @@ contains(CONFIG,zint){
####Automatically build required translation files (*.qm)
contains(CONFIG,build_translations){
LANGUAGES = ru es_ES ar
LANGUAGES = ru es_ES ar fr
defineReplace(prependAll) {
for(a,$$1):result += $$2$${a}$$3