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.0' into develop

Browse Source 
Finish 1.6.0
This commit is contained in:
fralx
2021-12-24 15:49:36 +03:00
parent 10060fa07f 8dab5f6870
commit 94a613f963
47 changed files with 823 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/lrglobal.cpp
View File

@@ -67,7 +67,7 @@ QString replaceHTMLSymbols(const QString &value)
return result;
}
#if QT_VERSION < 0x060000
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QVector<QString> normalizeCaptures(const QRegExp& reg){
#else
QVector<QString> normalizeCaptures(const QRegularExpressionMatch &reg){

6
include/lrglobal.h
View File

@@ -104,10 +104,10 @@ namespace Const{
QString extractClassName(QString className);
QString escapeSimbols(const QString& value);
QString replaceHTMLSymbols(const QString &value);
#if QT_VERSION < 0x060000
QVector<QString> normalizeCaptures(const QRegExp &reg);
#else
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 3)
QVector<QString> normalizeCaptures(const QRegularExpressionMatch &reg);
#else
QVector<QString> normalizeCaptures(const QRegExp &reg);
#endif
bool isColorDark(QColor color);