0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-09 14:04:43 +03:00

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

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

View File

@@ -31,7 +31,7 @@
#include "lrdatadesignintf.h"
#include <QStringList>
#include <QSqlQuery>
#if QT_VERSION < 0x060000
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
#include <QRegExp>
#endif
#include <QSqlError>
@@ -1495,7 +1495,7 @@ void DataSourceManager::invalidateQueriesContainsVariable(const QString& variabl
foreach (const QString& datasourceName, dataSourceNames()){
QueryHolder* holder = dynamic_cast<QueryHolder*>(m_datasources.value(datasourceName));
if (holder){
#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));