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
Arin Alexander
6f35c5e2a3
Build on Linux & Mac fixed
2016-03-31 03:55:27 +03:00
Arin Alexander
cfd971cd46
Project structure changed
2016-03-31 03:42:12 +04:00
Arin Alexander
d5a5d73e3f
Fix build on Windows
2016-03-31 00:50:22 +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
newsages
598d4f10ed
Change to subforder project model.
2016-03-21 02:12:30 +01:00