Merge branch 'master' into 1.4

This commit is contained in:
Arin Alexander 2016-07-08 10:40:48 +03:00
commit 81d896eecc

View File

@ -957,12 +957,16 @@ void DataSourceManager::collectionLoadFinished(const QString &collectionName)
if (collectionName.compare("queries",Qt::CaseInsensitive)==0){
foreach(QueryDesc* query,m_queries){
connect(query, SIGNAL(queryTextChanged(QString,QString)),
this, SLOT(slotQueryTextChanged(QString,QString)));
putHolder(query->queryName(),new QueryHolder(query->queryText(), query->connectionName(), this));
}
}
if (collectionName.compare("subqueries",Qt::CaseInsensitive)==0){
foreach(SubQueryDesc* query,m_subqueries){
connect(query, SIGNAL(queryTextChanged(QString,QString)),
this, SLOT(slotQueryTextChanged(QString,QString)));
putHolder(query->queryName(),new SubQueryHolder(query->queryText(), query->connectionName(), query->master(), this));
}
}