mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-23 16:22:58 +03:00
Code
1,781 Commits 13 Branches 203 Tags 24 MiB
master
Commit Graph

289 Commits

Author SHA1 Message Date
Arin Alex
e38986b38d Finish 1.4.99 
# Conflicts:
#	common.pri
#	demo_r1/demo_r1.pro
 2018-08-10 02:30:42 +03:00
Arin Alex
66b1d80f38 CONFIG param "config_build_dir" has been added 2018-08-10 02:26:06 +03:00
Arin Alexander
a95d3ab09f Finish 1.4.98 2018-08-09 22:08:44 +03:00
Arin Alexander
d9a28e9110 page footer placement changed 2018-08-09 22:08:36 +03:00
Arin Alexander
539600fa02 Finish 1.4.97 
# Conflicts:
#	limereport/lrbanddesignintf.cpp
#	limereport/lrbanddesignintf.h
#	limereport/lrreportengine.cpp
 2018-08-07 23:41:29 +03:00
Arin Alexander
bb339a3a90 Band relocation has been changed 2018-08-07 23:30:40 +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
715c241a37 Add no_build_translations config parameter 2018-08-05 16:20:28 +03:00
frostasm
384368dd38 Move build location from project source top dir to qmake top build dir 2018-08-04 19:46:41 +03:00
Arin Alexander
0fa2896fa0 Finish 1.4.96 2018-07-24 23:11:29 +03:00
Arin Alexander
d1dec36609 Band relocation algorithm has been changed 2018-07-24 23:11:21 +03:00
Arin Alexander
ba7a786a81 Finish 1.4.95 
# Conflicts:
#	limereport/lrreportrender.cpp
 2018-07-20 14:10:51 +03:00
Arin Alexander
84c2428dc1 Vertical columns headers fixed 2018-07-20 14:04:53 +03:00
Arin Alexander
ce481b3ebd Finish 1.4.94 2018-07-20 11:48:11 +03:00
Arin Alexander
0e9b8055e9 Bands relocation has been fixed 2018-07-20 11:48:01 +03:00
Arin Alexander
be36aefb87 Finish 1.4.93 2018-07-18 21:39:35 +03:00
Arin Alexander
90ae2ac188 Columns rendering has been fixed 2018-07-18 21:39:25 +03:00
Arin Alexander
7287c0dd0b Finish 1.4.92 
# Conflicts:
#	limereport/lrreportrender.cpp
 2018-07-18 19:56:01 +03:00
Arin Alexander
f3ba4fcd80 Columns rendering has been fixed 2018-07-18 19:48:05 +03:00
Arin Alexander
5d4e1d7957 Finish 1.4.91 2018-07-16 16:17:38 +03:00
Arin Alexander
8c19656c4e Version has been changed 2018-07-16 16:13:36 +03:00
Arin Alexander
e70adf0a66 Finish 1.4.90 
# Conflicts:
#	limereport/lrpagedesignintf.cpp
 2018-07-13 17:50:26 +03:00
Arin Alexander
6641215cc0 Bands relocation redo, undo fixed 2018-07-13 17:40:49 +03:00
Arin Alexander
329ac09db2 Finish 1.4.89 2018-07-13 02:25:20 +03:00
Arin Alexander
af12120260 Band relocation has been fixed 2018-07-13 02:25:10 +03:00
Arin Alexander
855e2196d0 Finish 1.4.88 2018-07-12 21:10:36 +03:00
Arin Alexander
dfa596ef94 Version changed 2018-07-12 21:10:19 +03:00
Arin Alexander
449c9a47bd Finish 1.4.87 2018-07-11 12:39:52 +03:00
Arin Alexander
f0a4448304 version changed 2018-07-11 12:39:04 +03:00
Arin Alexander
7064f911e6 Finish 1.4.86 
# Conflicts:
#	include/lrpreviewreportwidget.h
#	include/lrreportengine.h
#	limereport/lrpreviewreportwidget.cpp
#	limereport/lrpreviewreportwidget.h
#	limereport/lrreportengine.cpp
#	limereport/lrreportengine.h
#	limereport/lrreportengine_p.h
 2018-07-11 03:05:55 +03:00
Arin Alexander
b4d6ed76c8 Preview scale type has been added 2018-07-11 02:42:43 +03:00
Arin Alexander
3fd5662604 Finish 1.4.85 2018-07-10 21:59:25 +03:00
Arin Alexander
6ff055efb0 Font editor fixed 2018-07-10 21:59:12 +03:00
Arin Alexander
ea1b6e006f Finish 1.4.83 
# Conflicts:
#	limereport/bands/lrdataband.cpp
#	limereport/lrbanddesignintf.cpp
 2018-06-20 19:07:17 +03:00
Arin Alexander
072b623398 Band popup menu fixed 2018-06-20 18:47:59 +03:00
Arin Alexander
403fed6bcb Finish 1.4.80 
# Conflicts:
#	limereport/objectinspector/lrobjectitemmodel.cpp
#	translations/limereport_ru.ts
 2018-06-04 00:23:18 +03:00
Arin Alexander
21b9a94168 replaceCRwithBR property has been added 2018-06-04 00:17:56 +03:00
Arin Alexander
5e6704c697 QQmlEngine -> QJSEngine 2018-05-08 10:53:27 +03:00
Arin Alexander
eacc5c645e Build has been fixed 2018-05-07 22:52:28 +03:00
Arin Alex
ba57bbc57a Finish 1.4.78 2018-04-20 00:10:24 +03:00
Arin Alex
ab14b81ac3 Prepare rect has been refactored 2018-04-20 00:10:14 +03:00
Arin Alex
ab5eec990a Finish 1.4.77 
# Conflicts:
#	limereport/lrbanddesignintf.cpp
#	limereport/lrbanddesignintf.h
 2018-04-19 22:58:55 +03:00
Arin Alex
017c280ff6 Version changed 2018-04-19 22:40:04 +03:00
Arin Alexander
0011744923 Finish 1.4.76 2018-03-30 21:31:06 +03:00
Arin Alexander
0dd8640859 Band slicing has been fixed 2018-03-30 21:30:47 +03:00
Arin Alex
b65292dea8 Finish 1.4.75 2018-03-28 19:24:17 +03:00
Arin Alex
bae89854de Background fixed 2018-03-28 19:24:06 +03:00
Arin Alexander
7c92ecfc5f Finish 1.4.74 2018-03-27 01:10:34 +03:00
Arin Alexander
ddf05fb956 Bool propertyitem modified 2018-03-27 01:10:24 +03:00
Arin Alex
514506df1e Finish 1.4.73 2018-03-27 00:40:12 +03:00
Arin Alex
fdab56b1d8 Bool property item fixed 2018-03-27 00:39:59 +03:00
Arin Alex
5bb8c5fec6 Finish 1.4.72 2018-03-26 23:32:31 +03:00
Arin Alex
af30f3582e bool propertyitem fixed 2018-03-26 23:32:25 +03:00
Arin Alexander
fbbf6af33d Build has been fixed 2018-03-22 23:00:51 +03:00
Arin Alex
a072e84173 Finish 1.4.71 
# Conflicts:
#	limereport/objectinspector/lrobjectitemmodel.cpp
 2018-03-22 20:38:16 +03:00
Arin Alex
ae0deb183f watermark property translated 2018-03-22 20:36:14 +03:00
Arin Alex
57ab5c6fb0 Finish 1.4.70 
# Conflicts:
#	limereport/lrbasedesignintf.h
 2018-03-22 17:56:39 +03:00
Arin Alex
25b4ace815 Watermark fixed 2018-03-22 17:54:18 +03:00
Arin Alex
288aef75b2 Watermark 
# Conflicts:
#	limereport/items/lrimageitem.h
#	limereport/items/lrtextitem.h
#	limereport/lrbasedesignintf.cpp
#	limereport/lrbasedesignintf.h
 2018-03-22 17:41:30 +03:00
Arin Alex
87f5451cda Version changed to 1.4.69 2018-03-22 17:21:02 +03:00
Arin Alex
01e36f3bbe build without qtscriptengine fixed 2018-03-22 02:38:42 +03:00
Arin Alexander
1c379c568d Finish 1.4.68 (Subgroup fixed) 2018-03-15 11:02:01 +03:00
Arin Alexander
9d11ba719d Version changed 2018-03-15 11:01:09 +03:00
Arin Alexander
6ad35d63be Easyprofiler added 2018-02-28 23:19:14 +03:00
Arin Alex
f326e0a914 Finish 1.4.63 2018-01-23 23:06:45 +03:00
Arin Alex
a5fe4987af Version changed 2018-01-23 23:06:26 +03:00
Arin Alex
4ed437a6d0 Finish 1.4.62 2018-01-23 21:02:14 +03:00
Arin Alex
243983127d Version changed 2018-01-23 21:01:54 +03: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
4c3e96b01e Merge branch 'develop' into feature/Extract_Designer_to_plugin 2017-12-11 14:53:41 +03:00
Arin Alexander
76edb45543 Finish 1.4.57 
# Conflicts:
#	translations/limereport_ru.qm
 2017-12-11 01:02:52 +03:00
Arin Alexander
2bb40d76bd ru translation fixed 
Report items alignment fixed;
 2017-12-11 01:01:44 +03:00
Arin Alexander
1c2439f39b Finish 1.4.56 
# Conflicts:
#	translations/limereport_ar.ts
#	translations/limereport_es_ES.ts
 2017-12-10 22:22:57 +03:00
Arin Alexander
316b3eff7c Version changed 2017-12-10 22:11:53 +03:00
Arin Alexander
c41201c5b3 Finish 1.4.55 2017-12-10 16:24:44 +03:00
Arin Alexander
590080acff version changed 2017-12-10 16:24:14 +03:00
Arin Alexander
0a51aaff63 Merge branch 'develop' into feature/Extract_Designer_to_plugin 2017-12-07 21:31:03 +03:00
Arin Alexander
d1592508f9 Finish 1.4.54 2017-12-07 19:53:57 +03:00
Arin Alexander
2a1073be9c Splitting has been fixed 2017-12-07 19:52:52 +03:00
Arin Alexander
911eb1102a plugin finished 2017-11-27 23:14:05 +03:00
Arin Alexander
27427e90aa Finish 1.4.52 
# Conflicts:
#	include/lrreportengine.h
#	limereport/lrreportengine.cpp
#	limereport/lrreportengine.h
#	limereport/lrreportengine_p.h
 2017-11-01 22:17:25 +03:00
Arin Alexander
01ee099a04 setPreviewLayoutDirection() added to RepotEngine 2017-11-01 22:09:19 +03:00
Arin Alexander
23641333da QueryHolder fixed 2017-10-27 22:58:10 +03:00
Arin Alexander
7cb55690ee Version changed 2017-10-27 22:57:45 +03:00
Arin Alexander
de9d8721cc Qt4 build fixed 2017-10-26 13:33:22 +04:00
Arin Alexander
d46201ca21 Version changed 2017-10-26 13:32:16 +04:00
Arin Alexander
d0e10863b9 Finish 1.4.47 2017-10-24 01:54:57 +03:00
Arin Alexander
d91f97d337 Version changed 2017-10-24 01:50:23 +03:00
Arin Alexander
0ab92681b0 Finish 1.4.41 
# Conflicts:
#	limereport/lrbasedesignintf.h
#	limereport/lrreportdesignwidget.cpp
#	limereport/lrreportdesignwidget.h
#	limereport/lrreportengine.cpp
 2017-09-21 22:08:20 +03:00
Arin Alexander
f76d9c839b HorizontalLayout has been updated 2017-09-21 22:02:13 +03:00
Arin Alexander
b18fd6ea04 HorizontalLayout has been fixed 2017-09-21 14:46:37 +03:00
Arin Alexander
ea74221121 HorizontalLayout has been fixed 2017-09-21 14:43:54 +03:00
Rodrigo Torres
066a31d1c4 Define only once 2017-09-10 00:47:53 -03:00
Rodrigo Torres
614bb38c54 Simplify 2017-09-10 00:45:56 -03:00
Arin Alex
280b90dd0e QZint has been fixed 2017-09-08 06:30:38 +03:00
Rodrigo Torres
ba828a984f Update zint 2017-09-04 00:44:16 -03:00
Arin Alexander
03175dd6c1 Page renaming has been fixed 2017-08-19 01:24:45 +03:00
Arin Alexander
b068ba0a76 Page renaming has been fixed 2017-08-19 01:24:20 +03:00
Arin Alexander
b747f1948e Pages reordering has been added 
# Conflicts:
#	limereport/lrreportdesignwidget.cpp
#	limereport/lrreportdesignwidget.h
#	limereport/lrreportengine.cpp
#	limereport/lrreportengine_p.h
 2017-08-19 01:24:19 +04:00
Arin Alexander
2b94bad1c0 version 1.39 2017-08-19 01:18:09 +04:00
Arin Alexander
1ed5b90b5e Finish 1.4.38 
# Conflicts:
#	limereport/lrbanddesignintf.cpp
#	limereport/lrbanddesignintf.h
 2017-08-15 01:24:17 +03:00
Arin Alexander
ea844a0405 Context menu for multi selected items has been fixed 2017-08-15 01:21:59 +03:00
Arin Alexander
0a60babd69 Finish 1.4.34 
# Conflicts:
#	limereport/lrreportrender.cpp
 2017-07-14 17:44:39 +03:00
Arin Alexander
f9564fac56 Version has been changed 2017-07-14 17:42:17 +03:00
Arin Alexander
69feef3d98 Callback datasource has been fixed 2017-06-23 16:04:45 +03:00
Arin Alexander
b87009e1de Callback datasource has been fixed 2017-06-23 16:03:50 +03:00
Arin Alex
1c2de35166 CONFIG qtscriptengine & no_formdesigner have been added 2017-06-16 03:17:17 +03: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
4e19142358 Version has been changed to 1.4.18 2017-06-16 03:07:07 +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
9e5125c8fb Static build has been fixed 2017-06-14 12:07:40 +03:00
Arin Alexander
6a42e0c46c Static build has been fixed 2017-06-14 12:07:02 +03:00
Arin Alexander
b40d83ab07 Finish 1.4.13 2017-06-12 13:11:18 +03:00
Arin Alexander
801b3b4922 Static build has been fixed 2017-06-12 13:11:00 +03:00
Arin Alexander
d0cf6f4961 Finish Dialog_Designer 
# Conflicts:
#	limereport/limereport.pri
 2017-04-18 21:53:19 +03:00
Arin Alexander
cd2e748a9b QtDesigner integration has been added 
QtDesigner intergration has been added
 2017-04-10 18:45:54 +03:00
Arin Alex
92c93cd15d Merge branch 'master' into develop 2017-04-05 01:08:28 +03:00
Arin Alex
1ccfd147f1 version has been changed 2017-04-05 01:08:03 +03:00
Arin Alexander
2cc8569b1c 1.4.4 2017-03-03 01:24:23 +03:00
Arin Alexander
d864b1bf3e Version has been fixed 2017-03-03 01:12:45 +03:00
Arin Alexander
915b335fb5 Qt 4.8 build fixed 2017-03-02 19:47:42 +03:00
Arin Alexander
29b9ae1036 Version has been changed 2017-03-01 04:10:38 +03:00
Arin Alexander
ddc793f6e4 Merge branch '1.4' 
# Conflicts:
#	limereport/items/lrtextitem.cpp
#	limereport/items/lrtextitem.h
#	limereport/lrdatasourcemanager.cpp
#	limereport/lrdatasourcemanager.h
 2017-03-01 00:40:36 +03:00
Arin Alexander
21e3a6fbf9 Release version has been changed 2016-11-26 00:50:30 +03:00
Arin Alexander
43bff192a9 Merge branch '1.4' into 1.4_QJSEngine 2016-11-17 00:50:52 +03:00
Arin Alexander
e9b32ec7d7 Version has been changed 2016-11-17 00:50:36 +03:00
Arin Alex
cf1b2a4146 qjsengine and uitools are switched on 2016-11-02 14:54:36 +03:00
Arin Alex
2034aa15c8 QJSEngine has been added 2016-11-01 20:42:45 +03:00
Arin Alexander
a3deac3181 ui dialog demo added 2016-09-05 20:52:15 +04:00
Arin Alex
bf6adc13c3 Fix #40 Replace "QStyleOptionViewItemV4" with "QStyleOptionViewItem" 2016-07-07 23:48:03 +03:00
Arin Alexander
54278cdb37 LimeReport version has been changed to 1.3.11 2016-05-30 23:23:15 +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
Newsages
4665a7e914 DEST_INCLUDE_DIR = $$PWD/include/ to DEST_INCLUDE_DIR = $$PWD/include 2016-03-31 15:42:08 +02:00
Arin Alexander
cfd971cd46 Project structure changed 2016-03-31 03:42:12 +04: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
372c677f6f Fix build on Qt 4 2016-03-22 22:58:18 +03:00
Arin Alexander
0550654b04 Some limereport's project structure changes 2016-03-22 15:55:02 +03:00