0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-30 19:38:10 +03:00
Commit Graph

58 Commits

Author SHA1 Message Date
fralx
296fc475fd Merge tag '1.5.88' into develop
Finish 1.5.88

# Conflicts:
#	limereport/limereport.pri
#	limereport/limereport.pro
2021-09-11 19:29:52 +03:00
Rodrigo Torres
e96e1a9adc Simplify .pro/.pri 2021-08-18 14:14:37 -03:00
Arin Alexander
5da763f728 Merge tag '1.5.80' into develop
Finish 1.5.80
2021-02-17 21:54:26 +03:00
Arin Alexander
088a6eadce qzint build has been fixed 2021-02-03 22:00:14 +03:00
Arin Alexander
55e680ec3a Merge tag '1.5.52' into develop
Finish 1.5.52
2020-05-12 14:12:06 +03:00
Arin Alexander
c5ef44c1a9 quote() changed to \" 2020-05-12 14:11:58 +03:00
Arin Alexander
c83da367a9 xlsx exporter has been added 2019-11-19 23:04:04 +03:00
Arin Alexander
b929ac308b Translation build has been changed 2019-06-02 09:34:42 +03:00
Arin Alexander
89e899e660 es_ES changed to es 2019-05-29 23:03:22 +03:00
Arin Alexander
0245f5993a Finish 1.4.132
# Conflicts:
#	include/lrpreviewreportwidget.h
#	include/lrreportengine.h
#	limereport/limereport.pri
#	limereport/limereport.pro
#	limereport/lrpreviewreportwidget.h
#	limereport/lrpreviewreportwindow.h
#	limereport/lrreportengine.cpp
#	limereport/lrreportengine.h
#	limereport/lrreportengine_p.h
2019-05-29 18:10:26 +03:00
Arin Alexander
536a409393 Prepared pages processing has been refactored 2019-05-29 16:32:58 +03:00
Arin Alexander
3f0558f2e9 Merge branch 'master' into develop
# Conflicts:
#	limereport/objectinspector/propertyItems/lrdatasourcepropitem.cpp
2019-05-12 23:15:07 +03:00
Andrzej Woronko
0049678a02 Add pl to .pro 2019-05-07 15:50:55 +02:00
Arin Alexander
e5a0d2943d IDataSource extracted to own file 2019-01-24 22:10:15 +03:00
Arin Alexander
ce1656d2ef External drawing feature added to ImageItem 2019-01-14 23:33:20 +03:00
Arin Alexander
8b3a8a138e build fixed 2019-01-03 00:14:18 +03:00
Arin Alexander
ef7c76435a Finish 1.4.105
# Conflicts:
#	demo_r1/demo_r1.pro
#	demo_r2/demo_r2.pro
2018-10-30 01:53:34 +03:00
Arin Alexander
9bf90cf746 Cross compilations fixed 2018-10-30 00:22:43 +03:00
Arin Alexander
9c358278b6 Merge branch 'master' into develop
# Conflicts:
#	common.pri
#	limereport.pro
#	limereport/limereport.pro
2018-08-06 19:58:56 +03:00
frostasm
169c8bbf9c Install binary and header files to Qt installation dir 2018-08-05 16:20:26 +03:00
Arin Alexander
39253b1f55 lupdate parameter fixed 2018-06-20 22:43:41 +03:00
Arin Alexander
05df8021ba translation creation updated 2018-05-22 11:24:29 +03:00
Arin Alex
bd7bea989e Merge branch 'master' into develop
# Conflicts:
#	3rdparty/zint-2.4.4/backend_qt4/Zint.pro
#	demo_r1/demo_r1.pro
#	demo_r2/demo_r2.pro
#	designer/designer.pro
#	limereport/limereport.pro
#	translations/limereport_ar.ts
#	translations/limereport_es_ES.qm
#	translations/limereport_es_ES.ts
#	translations/limereport_fr.ts
#	translations/limereport_ru.qm
2018-03-13 15:23:47 +03:00
arne krüger
85f4fcf7ae Merge branch 'master' of https://github.com/Crystal-Photonics/LimeReport
# Conflicts:
#	3rdparty/zint-2.4.4/backend_qt4/Zint.pro
#	demo_r1/demo_r1.pro
#	demo_r2/demo_r2.pro
#	designer/designer.pro
#	translations/limereport_ru.ts
2018-03-09 19:01:07 +01:00
arne krüger
da9099cecb -target names for debug built dlls have now a "d" suffix 2018-03-09 18:33:59 +01:00
Arin Alex
edb89544f8 Merge branch 'master' into develop 2018-02-26 23:18:39 +03:00
weibt
e08e7b4339 Add Chinese translation 2018-02-25 13:33:17 +08:00
Arin Alexander
4c3e96b01e Merge branch 'develop' into feature/Extract_Designer_to_plugin 2017-12-11 14:53:41 +03:00
Arin Alexander
c41201c5b3 Finish 1.4.55 2017-12-10 16:24:44 +03:00
Arin Alexander
e6929b0c0f French translation has been added 2017-12-10 16:05:44 +03:00
Arin Alexander
911eb1102a plugin finished 2017-11-27 23:14:05 +03:00
Arin Alexander
40bafebbbd Qt4 build fixed 2017-10-26 13:24:06 +04:00
Rodrigo Torres
ba828a984f Update zint 2017-09-04 00:44:16 -03:00
Arin Alexander
8c5a9fcd91 Translation has been updated 2017-08-05 01:38:19 +03:00
Spiek
6b0195cb89 If compiling in debug mode append a "d" to the Target and also link to that files 2017-07-21 17:54:22 +02:00
Spiek
ec37242475 Build Environment for Windows has been fixed
- language files are now compile-able if path to build environment contains white spaces
- demo reports are now copied correctly if REPORTS_DIR or EXTRA_DIR contains white spaces
2017-07-11 11:18:28 +02:00
Arin Alex
2c0e343c55 Static build has been fixed.
CONFIG no_zint & static_build flags have been added
2017-06-16 03:06:09 +03:00
Arin Alexander
6a42e0c46c Static build has been fixed 2017-06-14 12:07:02 +03:00
Arin Alexander
801b3b4922 Static build has been fixed 2017-06-12 13:11:00 +03:00
Arin Alexander
f409f54e8f Arabic translation has been added 2017-02-01 23:56:12 +03:00
Arin Alexander
ce01b9a9ab MinGW build fixed 2016-05-20 19:16:14 +04:00
newsages
abea99bd3f simplify DEST_BINS, DEST_LIBS 2016-04-03 15:33:41 +02:00
newsages
1acaa431c4 ARCH_TYPE
unix{
    ARCH_DIR       = $${OUT_PWD}/unix
    ARCH_TYPE      = unix
    macx{
        ARCH_DIR       = $${OUT_PWD}/macx
        ARCH_TYPE      = macx
    }
    linux{
        !contains(QT_ARCH, x86_64){
            message("Compiling for 32bit system")
            ARCH_DIR       = $${OUT_PWD}/linux32
            ARCH_TYPE      = linux32
        }else{
            message("Compiling for 64bit system")
            ARCH_DIR       = $${OUT_PWD}/linux64
            ARCH_TYPE      = linux64
        }
    }
}
win32 {
    ARCH_DIR       = $${OUT_PWD}/win32
    ARCH_TYPE      = win32
}

DESTDIR  = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib

LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib
2016-04-03 15:08:17 +02:00
Arin Alex
57e7346e22 Fix build on Linux 2016-04-02 06:03:11 +03:00
Arin Alexander
d3038816ca Fix build on Windows 2016-04-02 06:05:41 +04:00
Arin Alexander
ca1a700b61 Fix build on Windows 2016-04-01 19:46:42 +04:00
Newsages
4665a7e914 DEST_INCLUDE_DIR = $$PWD/include/ to DEST_INCLUDE_DIR = $$PWD/include 2016-03-31 15:42:08 +02:00
Newsages
aeb11d0318 not use end of / on $$VARIABLE_DIR for unix 2016-03-31 15:30:00 +02:00
newsages
54fe767e16 Update limereport.pro 2016-03-31 15:15:55 +02:00
Arin Alexander
9747873db9 lrpreviewreportwidget.h added to EXTRA_FILES 2016-03-31 05:10:04 +04:00