0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-26 01:24:39 +03:00
Commit Graph

48 Commits

Author SHA1 Message Date
Arin Alexander
d391c58e26 Multicolumn bands rendering has been fixed
# Conflicts:
#	limereport/lrreportrender.cpp
#	limereport/lrreportrender.h
2018-06-07 21:03:55 +03:00
Arin Alexander
eacc5c645e Build has been fixed 2018-05-07 22:52:28 +03:00
Arin Alexander
fbbf6af33d Build has been fixed 2018-03-22 23:00:51 +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
6ad35d63be Easyprofiler added 2018-02-28 23:19:14 +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
0fb1ba1bd8 plugin extracted 2017-11-24 00:13:47 +03:00
Arin Alexander
40bafebbbd Qt4 build fixed 2017-10-26 13:24:06 +04:00
Arin Alexander
5c3c032ea3 Changing the language from the script has been added 2017-09-01 02:02:51 +03:00
Arin Alexander
992c53e19a TOC generation has been changed 2017-08-31 02:53:34 +03:00
Arin Alexander
9f2bfc66d7 TOC demo has been added 2017-08-19 01:33:10 +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
cbf205b728 1.4.9 2017-04-20 21:10:31 +03:00
Andy Maloney
42e0e3b70b Fix missed uses in the demo 2017-04-08 21:44:52 -04:00
Arin Alexander
c37a310918 Merge branch '1.4' into 1.4_QJSEngine
# Conflicts:
#	limereport/lritemdesignintf.cpp
#	limereport/lrreportrender.cpp
#	limereport/lrscriptenginemanager.cpp
2017-02-08 19:21:08 +03:00
Arin Alexander
3807ac0c57 limereport.pri for static building and aliases have been added 2016-12-22 02:08:27 +03:00
Arin Alexander
6d31f20566 OneSlotDS has been added to demo_r1 2016-12-06 00:27:22 +03:00
Arin Alexander
bca1019803 Path to database has been fixed 2016-12-06 00:27:21 +03:00
Arin Alexander
b4dea2fcfd New demo reports have been added 2016-11-18 01:14:01 +03:00
Arin Alexander
47b5aca63a Merge branch '1.4' into 1.4_QJSEngine 2016-11-05 00:48:39 +03:00
Arin Alexander
fbb9ac47af Merge branch 'master' into 1.4
# Conflicts:
#	translations/limereport_es_ES.qm
#	translations/limereport_es_ES.ts
#	translations/limereport_ru.qm
#	translations/limereport_ru.ts
2016-11-05 00:39:51 +03:00
Arin Alexander
8c09e5ed51 Images has been changed 2016-11-05 00:37:33 +03:00
Arin Alex
2034aa15c8 QJSEngine has been added 2016-11-01 20:42:45 +03:00
Arin Alexander
2152c3f4f1 Merge branch 'master' into 1.4 2016-10-18 15:00:40 +03:00
Arin Alexander
ebde2c1c20 Hide unused warnings 2016-10-18 15:00:26 +03:00
Arin Alexander
a3deac3181 ui dialog demo added 2016-09-05 20:52:15 +04:00
Arin Alex
8b77433ab3 Demo report has been changed 2016-07-08 00:03:07 +03: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 Alex
2b0e211bc9 $$QMAKE_COPY --> $$QMAKE_COPY_DIR 2016-04-02 03:43:52 +03:00
Arin Alexander
ca1a700b61 Fix build on Windows 2016-04-01 19:46:42 +04:00
Newsages
aeb11d0318 not use end of / on $$VARIABLE_DIR for unix 2016-03-31 15:30:00 +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
Arin Alexander
9d9f1f4d98 Callback interface has been simplified
From now on if slot getCallbackData(const LimeReport::CallbackInfo& info, QVariant& data) returns row count then there is no more need to implement second slot changePos(const LimeReport::CallbackInfo::ChangePosType& type, bool& result);
2016-03-27 10:40:13 +03:00
Arin Alexander
2679e0ec07 Fix build on Mac and "/" added to REPORTS_DIR 2016-03-24 15:53:05 +03:00
Arin Alexander
ab38b435ca One more limereport's project structure changes 2016-03-24 02:18:08 +03:00
Arin Alex
7e78790123 Fix build demo on Linux 2016-03-22 23:12:25 +03:00
Arin Alexander
0550654b04 Some limereport's project structure changes 2016-03-22 15:55:02 +03:00
Arin Alexander
58d2063438 Demo reports added 2016-03-22 15:46:53 +03:00
newsages
598d4f10ed Change to subforder project model. 2016-03-21 02:12:30 +01:00