0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 00:33:02 +03:00

Finish 1.4.41

# Conflicts:
#	limereport/lrdatasourcemanager.cpp
#	limereport/lrscriptenginemanager.cpp
This commit is contained in:
Arin Alexander 2017-09-19 22:08:04 +03:00
commit 6e350fa0b8

View File

@ -1250,12 +1250,14 @@ void DataSourceManager::slotQueryTextChanged(const QString &queryName, const QSt
void DataSourceManager::invalidateQueriesContainsVariable(const QString& variableName)
{
foreach (const QString& datasourceName, dataSourceNames()){
QueryHolder* holder = dynamic_cast<QueryHolder*>(m_datasources.value(datasourceName));
if (holder){
QRegExp rx(QString(Const::NAMED_VARIABLE_RX).arg(variableName));
if (holder->queryText().contains(rx))
holder->invalidate(designTime()?IDataSource::DESIGN_MODE:IDataSource::RENDER_MODE);
if (!variableIsSystem(variableName)){
foreach (const QString& datasourceName, dataSourceNames()){
QueryHolder* holder = dynamic_cast<QueryHolder*>(m_datasources.value(datasourceName));
if (holder){
QRegExp rx(QString(Const::NAMED_VARIABLE_RX).arg(variableName));
if (holder->queryText().contains(rx))
holder->invalidate(designTime()?IDataSource::DESIGN_MODE:IDataSource::RENDER_MODE);
}
}
}
}