python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-10-02 11:55:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.4

Browse Source
This commit is contained in:
Arin Alex
2016-11-08 01:09:54 +03:00
parent 9fe00a0e41 0055790bcd
commit 71aaaac34d
5 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
limereport/lrdatasourcemanager.h
View File

@@ -189,6 +189,9 @@ public:
QSharedPointer<QAbstractItemModel> previewSQL(const QString& connectionName, const QString& sqlText, QString masterDatasource="");
void updateDatasourceModel();
bool isNeedUpdateDatasourceModel(){ return m_needUpdate;}
QString defaultDatabasePath() const;
void setDefaultDatabasePath(const QString &defaultDatabasePath);
signals:
void loadCollectionFinished(const QString& collectionName);
void cleared();
@@ -208,7 +211,6 @@ protected:
virtual QObject *elementAt(const QString& collectionName,int index);
virtual void collectionLoadFinished(const QString& collectionName);
void setSystemVariable(const QString& name, const QVariant& value, RenderPass pass);
void setLastError(const QString& value);
void invalidateLinkedDatasources(QString datasourceName);
@@ -236,6 +238,7 @@ private:
QStringList m_errorsList;
bool m_designTime;
bool m_needUpdate;
QString m_defaultDatabasePath;
};
}