diff --git a/3rdparty/3rdparty.pro b/3rdparty/3rdparty.pro index 55b39b9..7630102 100644 --- a/3rdparty/3rdparty.pro +++ b/3rdparty/3rdparty.pro @@ -1,9 +1,5 @@ -#QMAKE_CFLAGS += -std=c99 ZINT_PATH = $$PWD/zint-2.4.4/ ZINT_VERSION = 2.4.4 -#include(qzint.pri) -#win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../zint-2.4.3/build-backend_dll-Desktop_Qt_5_5_0_MSVC2010_32bit-Release/release/ -lQtZint22 -#else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../zint-2.4.3/build-backend_dll-Desktop_Qt_5_5_0_MSVC2010_32bit-Release/debug/ -lQtZint22 INCLUDEPATH += $${ZINT_PATH}/backend $${ZINT_PATH}/backend_qt4 DEPENDPATH += $${ZINT_PATH}/backend $${ZINT_PATH}/backend_qt4 include($${ZINT_PATH}/backend_qt4/Zint.pro) diff --git a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro index db6f84e..57874e8 100644 --- a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro +++ b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro @@ -11,6 +11,7 @@ CONFIG(release, debug|release){ BUILD_TYPE = debug } +include(../../../common.pri) macx{ CONFIG -= dll @@ -105,26 +106,26 @@ SOURCES += \ unix { UNIX_DIR = $${OUT_PWD}/unix - MOC_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/moc - UI_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/ui - UI_HEADERS_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/ui - UI_SOURCES_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/ui - OBJECTS_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/obj - RCC_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/rcc - DESTDIR = $$PWD/../../../build/unix/$${BUILD_TYPE}/lib + MOC_DIR = $${UNIX_DIR}/moc/$${BUILD_TYPE} + UI_DIR = $${UNIX_DIR}/ui/$${BUILD_TYPE} + UI_HEADERS_DIR = $${UNIX_DIR}/ui/$${BUILD_TYPE} + UI_SOURCES_DIR = $${UNIX_DIR}/ui/$${BUILD_TYPE} + OBJECTS_DIR = $${UNIX_DIR}/obj/$${BUILD_TYPE} + RCC_DIR = $${UNIX_DIR}/rcc/$${BUILD_TYPE} + DESTDIR = $${BUILD_DIR}/lib/$${BUILD_TYPE} DLLDESTDIR = $${DESTDIR} } win32 { WIN32_DIR = $${OUT_PWD}/win32 - MOC_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/moc - UI_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/ui - UI_HEADERS_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/ui - UI_SOURCES_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/ui - OBJECTS_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/obj - RCC_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/rcc - DESTDIR = $$PWD/../../../build/win32/$${BUILD_TYPE}/lib + MOC_DIR = $${WIN32_DIR}/moc/$${BUILD_TYPE} + UI_DIR = $${WIN32_DIR}/ui/$${BUILD_TYPE} + UI_HEADERS_DIR = $${WIN32_DIR}/ui/$${BUILD_TYPE} + UI_SOURCES_DIR = $${WIN32_DIR}/ui/$${BUILD_TYPE} + OBJECTS_DIR = $${WIN32_DIR}/obj/$${BUILD_TYPE} + RCC_DIR = $${WIN32_DIR}/rcc/$${BUILD_TYPE} + DESTDIR = $${BUILD_DIR}/lib/$${BUILD_TYPE} DLLDESTDIR = $${DESTDIR} } diff --git a/common.pri b/common.pri index 2e7bf18..424f09e 100644 --- a/common.pri +++ b/common.pri @@ -1,6 +1,7 @@ #CONFIG += build_translations -CONFIG += zint -ZINT_PATH = $$PWD/3rdparty/zint-2.4.4 +#CONFIG += zint +#ZINT_PATH = $$PWD/3rdparty/zint-2.4.4 +BUILD_DIR = $$PWD/build/$${QT_VERSION} LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 3 diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro index af0bd71..f721a9e 100644 --- a/demo_r1/demo_r1.pro +++ b/demo_r1/demo_r1.pro @@ -5,7 +5,11 @@ greaterThan(QT_MAJOR_VERSION, 4){ QT += widgets printsupport DEFINES += HAVE_QT5 } -CONFIG += app_bundle + +macx{ + CONFIG += app_bundle +} + TARGET = LRDemo TEMPLATE = app @@ -23,6 +27,8 @@ RESOURCES += \ r1.qrc EXTRA_DIR += $$PWD/demo_reports/* +DEST_DIR = $${BUILD_DIR}/demo/$${BUILD_TYPE} +REPORTS_DIR = $${DEST_DIR}/demo_reports/ CONFIG(release, debug|release){ message(Release) @@ -32,10 +38,7 @@ CONFIG(release, debug|release){ BUILD_TYPE = debug } -unix{ - UNIX_DIR = $$PWD/../build/unix - DEST_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/demo - REPORTS_DIR = $${DEST_DIR}/demo_reports/ +unix{ MOC_DIR = $${OUT_PWD}/moc UI_DIR = $${OUT_PWD}/ui UI_HEADERS_DIR = $${OUT_PWD}/ui @@ -43,25 +46,18 @@ unix{ OBJECTS_DIR = $${OUT_PWD}/obj RCC_DIR = $${OUT_PWD}/rcc - LIBS += -L$$PWD/../build/unix/$${BUILD_TYPE}/lib -llimereport + LIBS += -L$${BUILD_DIR}/lib/$${BUILD_TYPE} -llimereport contains(CONFIG,zint){ - LIBS += -L$$PWD/../build/unix/$${BUILD_TYPE}/lib -lQtZint + LIBS += -L$${BUILD_DIR}/lib/$${BUILD_TYPE} -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) - 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} } win32 { - WIN32_DIR = $$PWD/../build/win32 EXTRA_DIR ~= s,/,\\,g - DEST_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/demo - DEST_DIR ~= s,/,\\,g - REPORTS_DIR = $${DEST_DIR}/demo_reports/ + DEST_DIR ~= s,/,\\,g REPORTS_DIR ~= s,/,\\,g MOC_DIR = $${OUT_PWD}/moc @@ -75,7 +71,7 @@ win32 { RC_FILE += mainicon.rc QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\\n\\t) - LIBS += -L$$PWD/../build/win32/$${BUILD_TYPE}/lib -llimereport + LIBS += -L$${BUILD_DIR}/lib/$${BUILD_TYPE} -llimereport } unix{ diff --git a/limereport/limereport.pro b/limereport/limereport.pro index c422868..3730421 100644 --- a/limereport/limereport.pro +++ b/limereport/limereport.pro @@ -13,7 +13,11 @@ CONFIG += lib CONFIG += dll CONFIG += create_prl CONFIG += link_prl -CONFIG -= app_bundle + +macx{ + CONFIG -= dll + CONFIG += lib_bundle +} DEFINES += LIMEREPORT_EXPORTS @@ -25,41 +29,49 @@ EXTRA_FILES += \ $$PWD/lrscriptenginemanagerintf.h \ $$PWD/lrcallbackdatasourceintf.h +include(limereport.pri) + DEST_DIR = $$PWD/../include/ unix { + UNIX_DIR = $${OUT_PWD}/unix + MOC_DIR = $${UNIX_DIR}/moc/$${BUILD_TYPE} + UI_DIR = $${UNIX_DIR}/ui/$${BUILD_TYPE} + UI_HEADERS_DIR = $${UNIX_DIR}/ui/$${BUILD_TYPE} + UI_SOURCES_DIR = $${UNIX_DIR}/ui/$${BUILD_TYPE} + OBJECTS_DIR = $${UNIX_DIR}/obj/$${BUILD_TYPE} + RCC_DIR = $${UNIX_DIR}/rcc/$${BUILD_TYPE} + DESTDIR = $${BUILD_DIR}/lib/$${BUILD_TYPE} + + QMAKE_POST_LINK += mkdir -p $$quote($${BUILD_DIR}/lib/include) $$escape_expand(\\n\\t) + for(FILE,EXTRA_FILES){ - QMAKE_POST_LINK += $$quote($$QMAKE_COPY $${FILE} $${DEST_DIR}$$escape_expand(\n\t)) + QMAKE_POST_LINK += $$quote($$QMAKE_COPY $${FILE} $${DEST_DIR}) $$escape_expand(\\n\\t) } - MOC_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/moc - UI_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/ui - UI_HEADERS_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/ui - UI_SOURCES_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/ui - OBJECTS_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/obj - RCC_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/rcc - DESTDIR = $$PWD/../build/unix/$${BUILD_TYPE}/lib for(FILE,EXTRA_FILES){ - QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) | $$QMAKE_COPY $$quote($$FILE) $$quote($$DESTDIR/include/) $$escape_expand(\\n\\t) + QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${BUILD_DIR}/lib/include/) $$escape_expand(\\n\\t) } } win32 { EXTRA_FILES ~= s,/,\\,g DEST_DIR ~= s,/,\\,g + BUILD_DIR ~= s,/,\\,g + + WIN32_DIR = $${OUT_PWD}/win32 + MOC_DIR = $${WIN32_DIR}/moc/$${BUILD_TYPE} + UI_DIR = $${WIN32_DIR}/ui/$${BUILD_TYPE} + UI_HEADERS_DIR = $${WIN32_DIR}/ui/$${BUILD_TYPE} + UI_SOURCES_DIR = $${WIN32_DIR}/ui/$${BUILD_TYPE} + OBJECTS_DIR = $${WIN32_DIR}/obj/$${BUILD_TYPE} + RCC_DIR = $${WIN32_DIR}/rcc/$${BUILD_TYPE} + DESTDIR = $${BUILD_DIR}/lib/$${BUILD_TYPE} + for(FILE,EXTRA_FILES){ QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DEST_DIR) $$escape_expand(\\n\\t) } - MOC_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/moc - UI_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/ui - UI_HEADERS_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/ui - UI_SOURCES_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/ui - OBJECTS_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/obj - RCC_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/rcc - DESTDIR = $$PWD/../build/win32/$${BUILD_TYPE}/lib } -include(limereport.pri) - contains(CONFIG,zint){ message(zint) INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4 @@ -79,6 +91,7 @@ contains(CONFIG,build_translations){ } TRANSLATIONS = $$prependAll(LANGUAGES, $$TRANSLATIONS_PATH/limereport_,.ts) + qtPrepareTool(LUPDATE, lupdate) ts.commands = $$LUPDATE $$PWD -ts $$TRANSLATIONS diff --git a/limereport/lrpreviewreportwindow.cpp b/limereport/lrpreviewreportwindow.cpp index e024d28..0619fde 100644 --- a/limereport/lrpreviewreportwindow.cpp +++ b/limereport/lrpreviewreportwindow.cpp @@ -81,8 +81,8 @@ void PreviewReportWindow::restoreSetting() } else { QDesktopWidget *desktop = QApplication::desktop(); - int screenWidth = desktop->width(); - int screenHeight = desktop->height(); + int screenWidth = desktop->screenGeometry().width(); + int screenHeight = desktop->screenGeometry().height(); int x = screenWidth*0.1; int y = screenHeight*0.1; diff --git a/limereport/lrreportdesignwindow.cpp b/limereport/lrreportdesignwindow.cpp index b90c5f9..b0ebae7 100644 --- a/limereport/lrreportdesignwindow.cpp +++ b/limereport/lrreportdesignwindow.cpp @@ -604,8 +604,8 @@ void ReportDesignWindow::restoreSetting() } else { QDesktopWidget *desktop = QApplication::desktop(); - int screenWidth = desktop->width(); - int screenHeight = desktop->height(); + int screenWidth = desktop->screenGeometry().width(); + int screenHeight = desktop->screenGeometry().height(); int x = screenWidth*0.1; int y = screenHeight*0.1;