From 6f35c5e2a3f71a9b218322a37a5a369abf30750e Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Thu, 31 Mar 2016 03:55:27 +0300
Subject: [PATCH 1/2] Build on Linux & Mac fixed

---
 3rdparty/zint-2.4.4/backend_qt4/Zint.pro | 1 -
 demo_r1/demo_r1.pro                      | 6 +++---
 limereport/limereport.pro                | 9 ++++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro
index f9ffd8a..d74139b 100644
--- a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro
+++ b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro
@@ -8,7 +8,6 @@ include(../../../common.pri)
 macx{
     CONFIG -= dll
     CONFIG += lib_bundle
-    CONFIG += plugin
 }
 
 unix{
diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro
index 4976f75..be82dd1 100644
--- a/demo_r1/demo_r1.pro
+++ b/demo_r1/demo_r1.pro
@@ -30,19 +30,20 @@ EXTRA_DIR += $$PWD/demo_reports/*
 DEST_DIR       = $${BUILD_DIR}/$${BUILD_TYPE}/demo
 REPORTS_DIR    = $${DEST_DIR}/demo_reports
 
-unix{    
+unix:{
     LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport
     contains(CONFIG,zint){
         LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint
     }
     DESTDIR = $$DEST_DIR
     QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t)
+!macx{
     #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
 }
@@ -58,4 +59,3 @@ win32 {
     QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\\n\\t)
     LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport
 }
-
diff --git a/limereport/limereport.pro b/limereport/limereport.pro
index 77c25ad..cd9060e 100644
--- a/limereport/limereport.pro
+++ b/limereport/limereport.pro
@@ -9,6 +9,7 @@ CONFIG += link_prl
 macx{
     CONFIG  -= dll
     CONFIG  += lib_bundle
+    CONFIG  += plugin
 }
 
 DEFINES += LIMEREPORT_EXPORTS
@@ -25,11 +26,13 @@ include(limereport.pri)
 
 unix {
     DESTDIR  = $${BUILD_DIR}/$${BUILD_TYPE}/lib
-    #QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t)
     for(FILE,EXTRA_FILES){
-        QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}/include/) $$escape_expand(\\n\\t)
+        QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t)
     }
-    QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}*) $$quote($${DEST_DIR})
+macx{
+    QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t)
+}
+    QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}*) $$quote($${DESTDIR}/include/)
 }
 
 win32 {

From 9747873db9b5b90bb2d6d9aaf74338a83f4e588a Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Thu, 31 Mar 2016 05:10:04 +0400
Subject: [PATCH 2/2] lrpreviewreportwidget.h added to EXTRA_FILES

---
 include/lrpreviewreportwidget.h | 11 ++++++-----
 limereport/limereport.pro       |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/lrpreviewreportwidget.h b/include/lrpreviewreportwidget.h
index 94e9936..220843b 100644
--- a/include/lrpreviewreportwidget.h
+++ b/include/lrpreviewreportwidget.h
@@ -21,12 +21,9 @@ class LIMEREPORT_EXPORT PreviewReportWidget : public QWidget
     friend class PreviewReportWidgetPrivate;
 public:
     explicit PreviewReportWidget(ReportEnginePrivate *report, QWidget *parent = 0);
-    ~PreviewReportWidget();
-    void initPreview();
-    void setErrorsMesagesVisible(bool visible);
-    void setErrorMessages(const QStringList &value);
-    void refreshPages();
+    ~PreviewReportWidget();    
 public slots:
+    void refreshPages();
     void slotZoomIn();
     void slotZoomOut();
 
@@ -44,6 +41,10 @@ signals:
 private slots:
     void slotSliderMoved(int value);
     void reportEngineDestroyed(QObject* object);
+private:
+    void initPreview();
+    void setErrorsMesagesVisible(bool visible);
+    void setErrorMessages(const QStringList &value);
 private:
     Ui::PreviewReportWidget *ui;
     PreviewReportWidgetPrivate* d_ptr;
diff --git a/limereport/limereport.pro b/limereport/limereport.pro
index cd9060e..7fad193 100644
--- a/limereport/limereport.pro
+++ b/limereport/limereport.pro
@@ -20,7 +20,8 @@ EXTRA_FILES += \
     $$PWD/lrdatasourcemanagerintf.h \
     $$PWD/lrreportengine.h \
     $$PWD/lrscriptenginemanagerintf.h \
-    $$PWD/lrcallbackdatasourceintf.h
+    $$PWD/lrcallbackdatasourceintf.h \
+    $$PWD/lrpreviewreportwidget.h
 
 include(limereport.pri)