From 400f7f41467bb14fc5da5d06510423434dd84bea Mon Sep 17 00:00:00 2001 From: newsages Date: Thu, 31 Mar 2016 02:53:07 +0200 Subject: [PATCH 1/8] Create .travis.yml --- .travis.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..64a4064 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,31 @@ +language: cpp + +compiler: + - gcc + +sudo: required +dist: trusty + +env: + - QT_BASE=54 + - QT_BASE=55 + - QT_BASE=56 + +before_install: + - if [ "$QT_BASE" = "54" ]; then sudo add-apt-repository ppa:beineri/opt-qt542-trusty -y; fi + - if [ "$QT_BASE" = "55" ]; then sudo add-apt-repository ppa:beineri/opt-qt551-trusty -y; fi + - if [ "$QT_BASE" = "56" ]; then sudo add-apt-repository ppa:beineri/opt-qt56-trusty -y; fi + - sudo apt-get update -qq + +install: + - if [ "$QT_BASE" = "54" ]; then sudo apt-get install -qq qt54base; source /opt/qt54/bin/qt54-env.sh; fi + - if [ "$QT_BASE" = "55" ]; then sudo apt-get install -qq qt55base; source /opt/qt55/bin/qt55-env.sh; fi + - if [ "$QT_BASE" = "56" ]; then sudo apt-get install -qq qt56base; source /opt/qt56/bin/qt56-env.sh; fi + +script: + - qmake -r + - make + - make check + +notifications: + email: false From 235f26f6f8c82970a67addb78f42f0d0222b8e26 Mon Sep 17 00:00:00 2001 From: newsages Date: Thu, 31 Mar 2016 03:03:50 +0200 Subject: [PATCH 2/8] Update .travis.yml --- .travis.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 64a4064..fabf009 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,20 +7,15 @@ sudo: required dist: trusty env: - - QT_BASE=54 - - QT_BASE=55 - QT_BASE=56 before_install: - - if [ "$QT_BASE" = "54" ]; then sudo add-apt-repository ppa:beineri/opt-qt542-trusty -y; fi - - if [ "$QT_BASE" = "55" ]; then sudo add-apt-repository ppa:beineri/opt-qt551-trusty -y; fi - if [ "$QT_BASE" = "56" ]; then sudo add-apt-repository ppa:beineri/opt-qt56-trusty -y; fi - sudo apt-get update -qq install: - - if [ "$QT_BASE" = "54" ]; then sudo apt-get install -qq qt54base; source /opt/qt54/bin/qt54-env.sh; fi - - if [ "$QT_BASE" = "55" ]; then sudo apt-get install -qq qt55base; source /opt/qt55/bin/qt55-env.sh; fi - - if [ "$QT_BASE" = "56" ]; then sudo apt-get install -qq qt56base; source /opt/qt56/bin/qt56-env.sh; fi + - if [ "$QT_BASE" = "56" ]; then sudo apt-get install -qq qt56base qt56script; source /opt/qt56/bin/qt56-env.sh; fi + script: - qmake -r From 37542bdc0de852a569fa7a98bb4f0de64e3b8528 Mon Sep 17 00:00:00 2001 From: newsages Date: Thu, 31 Mar 2016 03:13:15 +0200 Subject: [PATCH 3/8] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fabf009..141d09c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ before_install: - sudo apt-get update -qq install: - - if [ "$QT_BASE" = "56" ]; then sudo apt-get install -qq qt56base qt56script; source /opt/qt56/bin/qt56-env.sh; fi + - if [ "$QT_BASE" = "56" ]; then sudo apt-get install -qq qt56base qt56script qt56tools ; source /opt/qt56/bin/qt56-env.sh; fi script: From 4990a6336edaf35ea451bcaf56216b850a2f508a Mon Sep 17 00:00:00 2001 From: newsages Date: Thu, 31 Mar 2016 03:19:36 +0200 Subject: [PATCH 4/8] Update README.md --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fb970a0..308f150 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,9 @@ -# LimeReport v1.3.10 +LimeReport v1.3.10 Compiling [![Build Status](https://travis-ci.org/newsages/LimeReport.svg?branch=master)](https://travis-ci.org/newsages/LimeReport.svg) +----------- +----------- + + + ##Features * Multi-platform support * Pure Qt4/Qt5 compatible code @@ -16,6 +21,7 @@ * A Smart band split moving data to the next page * PDF output + ##How to use it 1. Build limereport.pro. It will create a limereport shared library 2. In your project connect the limereport library then in source code add: From 1d957aff0a817a9bce7f0c5489a47c4d75fede83 Mon Sep 17 00:00:00 2001 From: newsages Date: Thu, 31 Mar 2016 03:20:26 +0200 Subject: [PATCH 5/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 308f150..ae40761 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -LimeReport v1.3.10 Compiling [![Build Status](https://travis-ci.org/newsages/LimeReport.svg?branch=master)](https://travis-ci.org/newsages/LimeReport.svg) +LimeReport v1.3.10 [![Build Status](https://travis-ci.org/newsages/LimeReport.svg?branch=master)](https://travis-ci.org/newsages/LimeReport.svg) ----------- ----------- From 07cc6f3c534b9c8c7ad624eea4ee11ef6d2d6127 Mon Sep 17 00:00:00 2001 From: newsages Date: Thu, 31 Mar 2016 03:25:19 +0200 Subject: [PATCH 6/8] Update limereport.pro --- limereport/limereport.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/limereport/limereport.pro b/limereport/limereport.pro index 77c25ad..15312b5 100644 --- a/limereport/limereport.pro +++ b/limereport/limereport.pro @@ -27,7 +27,7 @@ unix { DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib #QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) for(FILE,EXTRA_FILES){ - QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}/include/) $$escape_expand(\\n\\t) + QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t) } QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}*) $$quote($${DEST_DIR}) } From 6133a9cd122579fc2c648b8571291a021e86bbbe Mon Sep 17 00:00:00 2001 From: Newsages Date: Thu, 31 Mar 2016 03:48:57 +0200 Subject: [PATCH 7/8] subdirs mkdir -p --- limereport/limereport.pro | 6 +++--- translations/limereport_es_ES.ts | 23 +++++++++++++++-------- translations/limereport_ru.qm | Bin 28632 -> 28632 bytes translations/limereport_ru.ts | 19 +++++++++++++++++-- 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/limereport/limereport.pro b/limereport/limereport.pro index 15312b5..18554fe 100644 --- a/limereport/limereport.pro +++ b/limereport/limereport.pro @@ -25,11 +25,11 @@ include(limereport.pri) unix { DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib - #QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) + QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/ for(FILE,EXTRA_FILES){ - QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t) + QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) # inside of libs make /include/files } - QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}*) $$quote($${DEST_DIR}) + QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}*) $$quote($${DESTDIR}/include) #copy includes to /lib/include } win32 { diff --git a/translations/limereport_es_ES.ts b/translations/limereport_es_ES.ts index 702d834..cbf4d19 100644 --- a/translations/limereport_es_ES.ts +++ b/translations/limereport_es_ES.ts @@ -649,6 +649,21 @@ p, li { white-space: pre-wrap; } + + LimeReport::PreviewReportWidget + + Form + + + + PDF file name + + + + Report file name + + + LimeReport::PreviewReportWindow @@ -731,14 +746,6 @@ p, li { white-space: pre-wrap; } of %1 - - Report file name - - - - PDF file name - - LimeReport::ProxyHolder diff --git a/translations/limereport_ru.qm b/translations/limereport_ru.qm index 1f378b94cf1c8b2cd26eff51ea18537fb8344088..c1d404615aabf5e5d563ca414d5cb6a899c05809 100644 GIT binary patch delta 140 zcmca{pYg_h#tk-%jE$3R8P%B7Lnfy(rZXO!e3o%OrC)aYg rGhW(!lp|Vg@)W}$mX!3=lF7BkVPM8)Y5hv3&F>8-Gj6_P{KpyqLo6-l delta 138 zcmV;50CoS^-vQX)0kAv)0Vk6^0VV<_pOa+)X8~-J%>kbQ3bSnjz5xO%Y?CbnE&?do zlU)QC0VtDo1a<-`#FOm=h5{&lvvmb00TBcWW4A>B04HDyWi?d*04Kb&tp?5k0wz$C seF#SZ9kayFv)nWMJI3`aUjP6A diff --git a/translations/limereport_ru.ts b/translations/limereport_ru.ts index 31ecc0a..0a3886f 100644 --- a/translations/limereport_ru.ts +++ b/translations/limereport_ru.ts @@ -800,6 +800,21 @@ p, li { white-space: pre-wrap; } Верхний колонтитул + + LimeReport::PreviewReportWidget + + Form + + + + PDF file name + Имя PDF файла + + + Report file name + Файл отчета + + LimeReport::PreviewReportWindow @@ -876,11 +891,11 @@ p, li { white-space: pre-wrap; } Report file name - Файл отчета + Файл отчета PDF file name - Имя PDF файла + Имя PDF файла Preview From 706e01bf4786cf247bd6c3af5c4bdf446fdaf829 Mon Sep 17 00:00:00 2001 From: newsages Date: Thu, 31 Mar 2016 03:57:41 +0200 Subject: [PATCH 8/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ae40761..718878e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -LimeReport v1.3.10 [![Build Status](https://travis-ci.org/newsages/LimeReport.svg?branch=master)](https://travis-ci.org/newsages/LimeReport.svg) +LimeReport v1.3.10 [![Build Status](https://travis-ci.org/newsages/LimeReport.svg?branch=master)](https://travis-ci.org/newsages/LimeReport) ----------- -----------