Merge branch 'master' into 1.4

designer/designer.pro

@@ -0,0 +1,49 @@
+include(../common.pri)
+QT += core gui
+
+TARGET = LRDesigner
+TEMPLATE = app
+
+SOURCES += main.cpp
+
+INCLUDEPATH += $$PWD/../include
+DEPENDPATH  += $$PWD/../include
+
+DEST_DIR       = $${DEST_BINS}
+REPORTS_DIR    = $${DEST_DIR}
+
+macx{
+    CONFIG  += app_bundle
+}
+
+unix:{
+    LIBS += -L$${DEST_LIBS} -llimereport
+    contains(CONFIG,zint){
+        LIBS += -L$${DEST_LIBS} -lQtZint
+    }
+    DESTDIR = $$DEST_DIR
+linux{
+    #Link share lib to ../lib rpath
+    QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN
+    QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib
+    QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib
+    QMAKE_LFLAGS_RPATH += #. .. ./libs
+}
+    target.path = $${DEST_DIR}
+    INSTALLS = target
+}
+
+win32 {
+    EXTRA_DIR ~= s,/,\\,g
+    DEST_DIR ~= s,/,\\,g
+    REPORTS_DIR ~= s,/,\\,g
+
+    DESTDIR = $$DEST_DIR
+    RC_FILE += mainicon.rc
+
+    contains(CONFIG,zint){
+        LIBS += -L$${DEST_LIBS} -lQtZint
+    }
+    LIBS += -L$${DEST_LIBS} -llimereport
+}
+

designer/main.cpp

@@ -0,0 +1,10 @@
+#include <QApplication>
+#include <LimeReport>
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    LimeReport::ReportEngine report;
+    report.designReport();
+    return a.exec();
+}

designer/mainicon.rc

@@ -0,0 +1 @@
+DI_ICON1               ICON                    "main.ico"

limereport.pro

@@ -9,7 +9,7 @@ SUBDIRS += \
 
 CONFIG   += ordered
 
-SUBDIRS += demo_r1 demo_r2
+SUBDIRS += demo_r1 demo_r2 designer