Merge branch 'master' into 1.4

This commit is contained in:
Arin Alexander
2016-11-17 00:38:00 +03:00
4 changed files with 66 additions and 36 deletions

View File

@@ -220,6 +220,7 @@ private slots:
void slotQueryTextChanged(const QString& queryName, const QString& queryText);
private:
explicit DataSourceManager(QObject *parent = 0);
bool initAndOpenDB(QSqlDatabase &db, ConnectionDesc &connectionDesc);
Q_DISABLE_COPY(DataSourceManager)
private:
QList<ConnectionDesc*> m_connections;