0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-27 09:58:11 +03:00
Commit Graph

33 Commits

Author SHA1 Message Date
Arin Alexander
c5ef44c1a9 quote() changed to \" 2020-05-12 14:11:58 +03:00
fralx
1f7a9d769d
Update demo_r2.pro 2020-03-02 19:16:51 +03:00
fralx
fc46b7dbcb
Update demo_r2.pro 2020-03-02 18:56:16 +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
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 Alexander
09754e6906 QJSEngine will be used if Qt version 5.6 and higher 2017-12-14 02:28:57 +03:00
Arin Alexander
40bafebbbd Qt4 build fixed 2017-10-26 13:24:06 +04:00
Arin Alexander
ce9955bc47 Demo2 fixed 2017-10-05 14:12:12 +03:00
Arin Alex
8061d162dc Demo2 fixed 2017-10-05 02:47:45 +03:00
Arin Alex
5a185c444d Dark theme dir renamed 2017-10-05 02:30:00 +03:00
Arin Alex
38ffb3b64b Demo2 fixed 2017-10-05 02:08:35 +03:00
Arin Alex
3bf8637c4c Demo2 updated 2017-10-05 01:40:17 +03:00
Arin Alex
3303d4461b icons updated 2017-10-05 01:40:17 +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
4e1a680e09 Syntax Error in mainicon.rc files has been fixed 2017-07-11 11:18:29 +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
2e6a7473ea no_zint & static_build flags has been added
# Conflicts:
#	common.pri
2017-06-16 03:10:00 +03: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
aa040e8031 LRDemo_r2 will get first template file to show 2017-03-03 02:23:23 +03:00
Arin Alexander
97bd5e4584 Fix #56 isBusy has been added to ReportEngine 2016-12-13 12:47:55 +03:00
Arin Alexander
2132bc9e34 actionOneToOne fixed 2016-05-24 01:39:56 +04:00
Arin Alexander
11a06456b1 Demo R2 refactored 2016-05-24 01:32:21 +04:00
Arin Alexander
ce01b9a9ab MinGW build fixed 2016-05-20 19:16:14 +04:00
Arin Alexander
8aa23b3fb9 Window icon changed 2016-04-06 23:01:27 +04:00
Arin Alexander
79feedd360 page scale refactored 2016-04-06 00:06:11 +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 Alexander
caa516d6bd Scale actions have been added to Report Preview Window 2016-04-02 16:07:01 +03: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 Alex
2a16d10df2 Demo r2 added 2016-04-02 03:39:45 +03:00