Merge branch 'master' into develop

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

.qmake.cache.in

@@ -0,0 +1,2 @@
+TOP_SRC_DIR=$$PWD
+TOP_BUILD_DIR=$$OUT_PWD

.qmake.conf

@@ -0,0 +1,2 @@
+TOP_SRC_DIR=$$PWD
+TOP_BUILD_DIR=$$shadowed($$PWD)

.travis.yml

@@ -18,7 +18,7 @@ install:
   
 
 script:
-  - qmake -r
+  - qmake -r limereport.pro
   - make
   - make check
 

common.pri

@@ -1,4 +1,6 @@
-CONFIG *= build_translations
+!contains(CONFIG, no_build_translations){
+    CONFIG += build_translations
+}
 #CONFIG *= easy_profiler
 
 !contains(CONFIG, no_zint){
@@ -67,7 +69,12 @@ CONFIG(release, debug|release){
     BUILD_TYPE = debug
 }
 
-BUILD_DIR = $$PWD/build/$${QT_VERSION}
+isEmpty(TOP_BUILD_DIR) {
+BUILD_DIR = $${OUT_PWD}/build/$${QT_VERSION}
+}else{
+BUILD_DIR = $${TOP_BUILD_DIR}/build/$${QT_VERSION}
+}
+
 DEST_INCLUDE_DIR = $$PWD/include
 unix{
     ARCH_DIR       = $${OUT_PWD}/unix

initvars.pro

@@ -0,0 +1,3 @@
+TEMPLATE=subdirs
+SUBDIRS= # don't build anything, we're just generating the .qmake.cache file
+QMAKE_SUBSTITUTES += .qmake.cache.in

limereport.pro

@@ -11,12 +11,13 @@ contains(CONFIG, zint){
 
 export($$CONFIG)
 
-
-SUBDIRS += limereport
-
 CONFIG  += ordered
-
+SUBDIRS += \
-SUBDIRS += demo_r1 demo_r2 designer
+        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

limereport/limereport.prf

@@ -0,0 +1,22 @@
+QT += xml sql script
+
+greaterThan(QT_MAJOR_VERSION, 4) {
+QT += widgets printsupport
+}
+
+INCLUDEPATH += $$[QT_INSTALL_HEADERS]/LimeReport
+
+CONFIG(debug, debug|release) {
+LIB_NAME = limereportd
+} else {
+LIB_NAME = limereport
+}
+
+greaterThan(QT_MAJOR_VERSION, 4) {
+    LIBS += -l$${LIB_NAME}
+} else {
+    qtAddLibrary($${LIB_NAME})
+}
+
+DEFINES += LIMEREPORT
+DEFINES -= NO_LIMEREPORT

limereport/limereport.pro

@@ -33,7 +33,6 @@ contains(CONFIG, staticlib){
 }
 
 EXTRA_FILES += \
-    $$PWD/lrglobal.cpp \
     $$PWD/lrglobal.h \
     $$PWD/lrdatasourcemanagerintf.h \
     $$PWD/lrreportengine.h \
@@ -87,6 +86,19 @@ contains(CONFIG,zint){
 	}
 }
 
+#### Install mkspecs, headers and libs to QT_INSTALL_DIR
+
+headerFiles.path = $$[QT_INSTALL_HEADERS]/LimeReport/
+headerFiles.files = $${DEST_INCLUDE_DIR}/*
+INSTALLS += headerFiles
+
+mkspecs.path = $$[QT_INSTALL_DATA]/mkspecs/features
+mkspecs.files = limereport.prf
+INSTALLS += mkspecs
+
+target.path = $$[QT_INSTALL_LIBS]
+INSTALLS += target
+
 ####Automatically build required translation files (*.qm)
 
 contains(CONFIG,build_translations){