python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-10-31 22:01:22 +03:00
Code Issues Packages Projects Releases Wiki Activity
966 Commits 1 Branch 0 Tags
c4a24b1f3b840804ab25d44ba9dbb909670cf6ed
Commit Graph

966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fralx
af1a8d8265 Merge pull request #25 from newsages/master 
ARCH_TYPE
 2016-04-03 23:07:13 +03:00
newsages
abea99bd3f simplify DEST_BINS, DEST_LIBS 2016-04-03 15:33:41 +02:00
newsages
12824cee9a *.qm 2016-04-03 15:09:14 +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
70d6efccbf Merge pull request #9 from fralx/master 
update original master
 2016-04-03 14:34:32 +02:00
Arin Alexander
caa516d6bd Scale actions have been added to Report Preview Window 2016-04-02 16:07:01 +03:00
Arin Alexander
4e75bae701 build status swithched to https://api.travis-ci.org/fralx/LimeReport 2016-04-02 07:23:01 +04: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 Alex
2a16d10df2 Demo r2 added 2016-04-02 03:39:45 +03:00
Arin Alex
b315af26b9 Preview Widget refactored. 2016-04-02 03:38:23 +03:00
Arin Alex
2aec1cfc26 Fixed refresh pages 2016-04-01 23:39:07 +03:00
Arin Alexander
ca1a700b61 Fix build on Windows 2016-04-01 19:46:42 +04:00
Arin Alexander
a9f47cb729 User manuals added 2016-03-31 21:45:08 +03:00
fralx
7a4fd7edde Merge pull request #24 from newsages/master 
DEST_INCLUDE_DIR = $$PWD/include/ to DEST_INCLUDE_DIR = $$PWD/include
 2016-03-31 17:49:31 +03: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
newsages
d63ff0403b Merge pull request #8 from fralx/master 
update fork
 2016-03-31 14:31:50 +02:00
Arin Alexander
d0784e12ba Merge branch 'pulls/23' 2016-03-31 14:43:43 +03:00
Arin Alexander
aec0d3471e mkdir -p , README , travis.yml 
# Conflicts:
#	limereport/limereport.pro
 2016-03-31 14:25:46 +03:00
newsages
706e01bf47 Update README.md 2016-03-31 03:57:41 +02:00
newsages
59070bb20f Merge pull request #6 from newsages/newsages-patch-1 
Create .travis.yml
 2016-03-31 03:50:30 +02:00
Newsages
6133a9cd12 subdirs mkdir -p 2016-03-31 03:48:57 +02:00
newsages
71a1f9e4f9 Merge pull request #7 from newsages/newsages-patch-2 
Update limereport.pro
 2016-03-31 03:25:51 +02:00
newsages
07cc6f3c53 Update limereport.pro 2016-03-31 03:25:19 +02:00
newsages
1d957aff0a Update README.md 2016-03-31 03:20:26 +02:00
newsages
4990a6336e Update README.md 2016-03-31 03:19:36 +02:00
newsages
37542bdc0d Update .travis.yml 2016-03-31 03:13:15 +02:00
Arin Alexander
9747873db9 lrpreviewreportwidget.h added to EXTRA_FILES 2016-03-31 05:10:04 +04:00
newsages
235f26f6f8 Update .travis.yml 2016-03-31 03:03:50 +02:00
Arin Alexander
6f35c5e2a3 Build on Linux & Mac fixed 2016-03-31 03:55:27 +03:00
newsages
400f7f4146 Create .travis.yml 2016-03-31 02:53:07 +02:00
newsages
adcac14617 Merge pull request #5 from fralx/master 
sincro fork
 2016-03-31 01:57:53 +02: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
Arin Alexander
cdd46ff863 createPreviewWidget(QWidget* parent=0) method has been added to ReportEngine 2016-03-31 00:50:21 +04:00
Arin Alexander
a7192c350c PreviewReportWindow now uses PreviewReportWidget to show render result 2016-03-31 00:50:21 +04:00
Arin Alexander
9c57bb772f Preview Widget has been added 2016-03-31 00:50:20 +04:00
Arin Alexander
5717900216 Zommer has been moved to own module 
Zommer has been moved to own module
 2016-03-31 00:50:10 +04:00
newsages
2776ed7277 Merge pull request #4 from fralx/master 
Merge pull request #22 from newsages/master
 2016-03-28 12:06:58 +02:00
fralx
c0e8252be3 Merge pull request #22 from newsages/master 
Build subforlders logic
 2016-03-28 01:34:20 +03:00
newsages
7d6d7d39c8 logical Structure folders 2016-03-27 21:02:58 +02:00
newsages
61672e3b7a Merge pull request #3 from fralx/master 
update fork
 2016-03-27 19:43:54 +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
517bf8357e InputMode propperty has been added to BarcodeItem 2016-03-25 23:46:17 +03:00
Arin Alexander
225e0f6c91 Fix: 64 bit building & band slice 2016-03-25 19:59:44 +03:00
newsages
f219a39611 Merge pull request #2 from fralx/master 
update fork
 2016-03-24 15:11:50 +01:00
newsages
7ed8d40785 Update Fork 2016-03-24 15:10:44 +01:00