python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-10-01 19:51:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update Fork

Browse Source
This commit is contained in:
newsages
2016-03-24 15:10:44 +01:00
parent d80eb334ff
commit 7ed8d40785
7 changed files with 66 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
limereport/limereport.pro
View File

@@ -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

4
limereport/lrpreviewreportwindow.cpp
View File

@@ -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;

4
limereport/lrreportdesignwindow.cpp
View File

@@ -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;