Merge branch 'master' into develop

# Conflicts:
#	common.pri
#	limereport.pro
#	limereport/limereport.pro

limereport.pro

@@ -11,12 +11,13 @@ contains(CONFIG, zint){
 
 export($$CONFIG)
 
-
-SUBDIRS += limereport
-
 CONFIG  += ordered
-
-SUBDIRS += demo_r1 demo_r2 designer
+SUBDIRS += \
+        initvars.pro \
+        limereport \
+        demo_r1 \
+        demo_r2 \
+        designer
 
 !contains(CONFIG, embedded_designer){
 !contains(CONFIG, static_build){
@@ -24,5 +25,10 @@ SUBDIRS += designer_plugin
 }
 }
 
-
-
+# QMake top level srcdir and builddir
+# https://wiki.qt.io/QMake-top-level-srcdir-and-builddir
+#Qt4 .qmake.cache.in
+#Qt5 .qmake.conf
+OTHER_FILES += \
+    .qmake.conf \
+    .qmake.cache.in