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 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
