Commit Graph

287 Commits

Author SHA1 Message Date
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