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/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 18554fe..7fad193 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 @@ -19,17 +20,20 @@ EXTRA_FILES += \ $$PWD/lrdatasourcemanagerintf.h \ $$PWD/lrreportengine.h \ $$PWD/lrscriptenginemanagerintf.h \ - $$PWD/lrcallbackdatasourceintf.h + $$PWD/lrcallbackdatasourceintf.h \ + $$PWD/lrpreviewreportwidget.h include(limereport.pri) unix { DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib - QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/ for(FILE,EXTRA_FILES){ - QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) # inside of libs make /include/files + 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($${DESTDIR}/include) #copy includes to /lib/include +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 {