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

QT_VERSION < 0x060000 -> (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))

Browse Source 
page order has been fixed when TOC page is present and some pages are not printable
This commit is contained in:
Alexander Arin
2021-12-16 00:13:39 +03:00
parent 37b929459b
commit c7eec9160d
30 changed files with 360 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
limereport/items/lrtextitem.cpp
View File

@@ -359,11 +359,11 @@ void TextItem::updateLayout()
}
bool TextItem::isNeedExpandContent() const
{
bool result = false;
#if QT_VERSION < 0x060000
{
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QRegExp rx("$*\\{[^{]*\\}");
#else
bool result = false;
QRegularExpression rx("\\$*\\{[^{]*\\}");
result = content().contains(rx) || isContentBackedUp();
return result;
@@ -824,7 +824,7 @@ void TextItem::expandContent(DataSourceManager* dataManager, RenderPass pass)
{
QString context=content();
foreach (QString variableName, dataManager->variableNamesByRenderPass(SecondPass)) {
#if QT_VERSION < 0x060000
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QRegExp rx(QString(Const::NAMED_VARIABLE_RX).arg(variableName));
#else
QRegularExpression rx(QString(Const::NAMED_VARIABLE_RX).arg(variableName));