mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-12-13 16:30:58 +03:00
Code Activity

fixed conflicts

Browse Source
This commit is contained in:
yanis60
2024-06-06 23:23:34 +01:00
parent a860897b88 b4b2da8330
commit 9692654a24
58 changed files with 20064 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
limereport/lrscriptenginemanager.cpp
View File

@@ -649,7 +649,9 @@ QVariant ScriptEngineManager::evaluateScript(const QString& script){
QVariant varValue;
if (script.contains(rx)){
#else
QRegularExpression rx = getScriptRegEx();
QVariant varValue;
@@ -1977,12 +1979,14 @@ int ScriptFunctionsManager::getColumnCount(const QString &datasourceName)
return dm->columnCount(datasourceName);
}
int ScriptFunctionsManager::columnIndexByName(const QString &datasourceName, const QString &columnName)
{
DataSourceManager *dm = scriptEngineManager()->dataManager();
return dm->columnIndex(datasourceName,columnName);
}
#ifdef USE_QJSENGINE
void ScriptFunctionsManager::addItemsToComboBox(QJSValue object, const QStringList &values)