mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-11-07 00:21:24 +03:00
Code Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	limereport/lrscriptenginemanager.cpp
This commit is contained in:
Arin Alexander
2017-12-22 12:36:46 +03:00
parent 3b417ef801 d23a8e6de4
commit 67aea4f1ff
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
limereport/lrscriptenginemanager.h
View File

@@ -311,6 +311,7 @@ public:
Q_INVOKABLE QVariant dateFormat(QVariant value, const QString& format);
Q_INVOKABLE QVariant timeFormat(QVariant value, const QString& format);
Q_INVOKABLE QVariant dateTimeFormat(QVariant value, const QString& format);
Q_INVOKABLE QVariant sectotimeFormat(QVariant value, const QString& format);
Q_INVOKABLE QVariant date();
Q_INVOKABLE QVariant now();
Q_INVOKABLE QVariant currencyFormat(QVariant value, const QString& locale);
@@ -385,6 +386,7 @@ private:
bool createDateFormatFunction();
bool createTimeFormatFunction();
bool createDateTimeFormatFunction();
bool createSectotimeFormatFunction();
bool createDateFunction();
bool createNowFunction();
bool createCurrencyFormatFunction();