0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-26 17:38:09 +03:00
Commit Graph

51 Commits

Author SHA1 Message Date
Arin Alexander
a67bdda3d1 Merge tag '1.5.60' into develop
Finish 1.5.60
2020-07-14 19:57:38 +03:00
lifof
1306d3658a
Update qzint.h
Fixes a compilation issue on msys2's Qt5.15
2020-06-27 22:48:52 +01:00
Arin Alexander
53c018a5c7 HTML exporter init & qtxlsx has been fixed 2019-11-20 13:33:52 +03:00
Arin Alexander
4cbdec7744 qtxlsx has been added 2019-11-19 23:05:28 +03:00
Arin Alexander
3999dc00bd Static build has been fixed 2019-07-30 14:09:09 +03:00
Arin Alexander
0f227e803c CRC error has been fixed 2019-06-30 18:00:28 +03:00
Arin Alexander
e48cd4ce79 CRC error has been fixed 2019-06-30 17:44:44 +03:00
Arin Alexander
fbb014f451 Light theme has been fixed. 2019-06-30 12:43:54 +03:00
Arin Alexander
667a655e4a Rulers and inches support has been added 2019-06-26 00:24:40 +03:00
Arin Alex
cff2b379d4 Themes have been changed 2019-06-03 19:25:10 +03:00
Arin Alexander
70eb749c67 Light theme has been added 2019-05-26 15:15:06 +03:00
Arin Alexander
5da4d132e6 Dark theme has been changed 2019-05-23 19:01:07 +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 Alex
9b4d2c934c Dark theme updated 2018-06-29 00:51:09 +03:00
Arin Alex
bac39060bf Dark theme updated 2018-06-28 23:58:05 +03:00
Arin Alex
977be6cf77 Dark theme updated 2018-06-28 23:17:03 +03:00
Arin Alex
9bb0a43856 Dark theme updated 2018-06-28 22:54:44 +03:00
Arin Alex
13bf652cb6 Dark theme updated 2018-06-28 21:35:06 +03:00
Arin Alexander
3d8588316b Dark theme fixed 2018-05-15 22:12:36 +03:00
Arin Alex
3e0b58d3e2 DocWidget title color fixed 2018-03-26 23:57:44 +03:00
Arin Alexander
ddc19ed879 MacOS build fixed 2018-03-23 01:17:15 +03:00
arne krüger
996d3ff16a -zint dll is now created 2018-03-12 19:21:34 +01: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
6ad35d63be Easyprofiler added 2018-02-28 23:19:14 +03:00
Arin Alexander
3b417ef801 Dark theme fixed 2017-12-20 13:17:15 +03:00
Arin Alexander
0ab24565a5 GroupBox style fixed 2017-12-20 13:08:05 +03:00
Arin Alexander
2a1b759f74 theme updated 2017-12-11 21:59:11 +03:00
Arin Alexander
91d1e313c4 theme updated 2017-12-11 19:18:06 +03:00
Arin Alexander
13c6386af6 darktheme changed 2017-12-11 16:41:39 +03:00
Arin Alexander
911eb1102a plugin finished 2017-11-27 23:14:05 +03:00
Arin Alex
8d18a51c9d SpinBox theme fixed 2017-10-05 02:48:13 +03:00
Arin Alex
5a185c444d Dark theme dir renamed 2017-10-05 02:30:00 +03:00
Arin Alex
31f06a2320 Dark theme dir renamed 2017-10-05 02:29:03 +03:00
Arin Alex
cb9dd9e5d3 Dark theme added 2017-10-05 02:25:36 +03:00
Rodrigo Torres
f5f3f246f0 Remove parameter that does nothing 2017-09-10 01:03:32 -03:00
Arin Alex
280b90dd0e QZint has been fixed 2017-09-08 06:30:38 +03:00
Rodrigo Torres
c183e8f28c Forgot to remove old Zint folder 2017-09-05 18:32:49 -03:00
Rodrigo Torres
ba828a984f Update zint 2017-09-04 00:44:16 -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
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
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 Alexander
6f35c5e2a3 Build on Linux & Mac fixed 2016-03-31 03:55:27 +03:00
newsages
7d6d7d39c8 logical Structure folders 2016-03-27 21:02:58 +02:00
newsages
7ed8d40785 Update Fork 2016-03-24 15:10:44 +01:00
Arin Alexander
6c7443c510 COPYING has been added to zint 2016-03-22 15:52:57 +03:00
Arin Alexander
7a10231858 Zint has been pached for MSVC2010 2016-03-22 15:49:35 +03:00
newsages
598d4f10ed Change to subforder project model. 2016-03-21 02:12:30 +01:00