mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-02 11:54:59 +03:00
Code Activity

Merge tag '1.6.7' into develop

Browse Source 
Finish 1.6.7
This commit is contained in:
Alexander Arin
2022-08-23 01:31:26 +03:00
parent bc8c5b2c8c f359509a32
commit 40073d6eb3
56 changed files with 1978 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/lrglobal.h
View File

@@ -104,7 +104,7 @@ namespace Const{
QString extractClassName(QString className);
QString escapeSimbols(const QString& value);
QString replaceHTMLSymbols(const QString &value);
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 3)
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
QVector<QString> normalizeCaptures(const QRegularExpressionMatch &reg);
#else
QVector<QString> normalizeCaptures(const QRegExp &reg);
@@ -157,6 +157,16 @@ namespace Const{
#else
typedef QStyleOptionViewItem StyleOptionViewItem;
#endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
QRegularExpression getRegEx(QString expression);
QRegularExpression getVariableRegEx();
QRegularExpression getFieldRegEx();
QRegularExpression getScriptRegEx();
QRegularExpression getGroupFunctionRegEx(QString functionName);
QRegularExpression getGroupFunctionNameRegEx(QString functionName);
QRegularExpression getNamedVariableRegEx(QString variableName);
#endif
class Enums
{