0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-12-15 17:29:54 +03:00

fixed conflicts

This commit is contained in:
yanis60
2024-06-06 23:23:34 +01:00
58 changed files with 20064 additions and 606 deletions

View File

@@ -414,8 +414,10 @@ public:
* \return возможно -1 при ошибке
*/
Q_INVOKABLE int getColumnCount(const QString &datasourceName);
Q_INVOKABLE int columnIndexByName(const QString &datasourceName, const QString &columnName);
#ifdef USE_QJSENGINE
Q_INVOKABLE void addItemsToComboBox(QJSValue object, const QStringList& values);
Q_INVOKABLE void addItemToComboBox(QJSValue object, const QString& value);