mirror of
https://github.com/fralx/LimeReport.git
synced 2025-07-10 21:53:46 +03:00
minor fixes
This commit is contained in:
parent
c7e4028637
commit
cb6a6f19af
@ -367,13 +367,13 @@ bool TextItem::isNeedExpandContent() const
|
||||
{
|
||||
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
|
||||
QRegExp rx("$*\\{[^{]*\\}");
|
||||
return content().contains(rx) || isContentBackedUp();
|
||||
#else
|
||||
bool result = false;
|
||||
QRegularExpression rx("\\$*\\{[^{]*\\}");
|
||||
result = content().contains(rx) || isContentBackedUp();
|
||||
return result;
|
||||
#endif
|
||||
return content().contains(rx) || isContentBackedUp();
|
||||
}
|
||||
|
||||
QString TextItem::replaceBR(QString text) const { return text.replace("<br/>", "\n"); }
|
||||
|
@ -489,7 +489,6 @@ QString DataSourceManager::replaceVariables(QString value)
|
||||
}
|
||||
return value;
|
||||
#endif
|
||||
return QString();
|
||||
}
|
||||
|
||||
QString DataSourceManager::replaceVariables(QString query, QMap<QString, QString>& aliasesToParam)
|
||||
|
Loading…
Reference in New Issue
Block a user