feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

RemoteLinux/QNX: Fixed signal-slot connection

Browse Source 
Change-Id: I6f060880db7b9360b3d9c548f42cee46468eb4ab
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Tobias Nätterlund
2012-08-27 15:07:34 +02:00
committed by Daniel Teske
parent 972399830a
commit d80b608d52
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qnx/blackberrydeployinformation.cpp
View File

@@ -48,7 +48,7 @@ BlackBerryDeployInformation::BlackBerryDeployInformation(Qt4ProjectManager::Qt4P
: QAbstractTableModel(project) : QAbstractTableModel(project)
, m_project(project) , m_project(project)
{ {
connect(m_project, SIGNAL(buildSystemEvaluated()), this, SLOT(initModel())); connect(m_project, SIGNAL(proFilesEvaluated()), this, SLOT(initModel()));
} }
int BlackBerryDeployInformation::rowCount(const QModelIndex &parent) const int BlackBerryDeployInformation::rowCount(const QModelIndex &parent) const
@@ -175,7 +175,7 @@ void BlackBerryDeployInformation::initModel()
if (!rootNode || rootNode->parseInProgress()) // Can be null right after project creation by wizard. if (!rootNode || rootNode->parseInProgress()) // Can be null right after project creation by wizard.
return; return;
disconnect(m_project, SIGNAL(buildSystemEvaluated()), this, SLOT(initModel())); disconnect(m_project, SIGNAL(proFilesEvaluated()), this, SLOT(initModel()));
beginResetModel(); beginResetModel();
m_deployInformation.clear(); m_deployInformation.clear();
@@ -193,5 +193,5 @@ void BlackBerryDeployInformation::initModel()
} }
endResetModel(); endResetModel();
connect(m_project, SIGNAL(buildSystemEvaluated()), SLOT(initModel())); connect(m_project, SIGNAL(proFilesEvaluated()), SLOT(initModel()));
} }

6
src/plugins/remotelinux/deploymentinfo.cpp
View File

@@ -61,7 +61,7 @@ using namespace Internal;
DeploymentInfo::DeploymentInfo(Qt4ProjectManager::Qt4Project *project, const QString &installPrefix) DeploymentInfo::DeploymentInfo(Qt4ProjectManager::Qt4Project *project, const QString &installPrefix)
: QAbstractListModel(project), d(new DeploymentInfoPrivate(project)) : QAbstractListModel(project), d(new DeploymentInfoPrivate(project))
{ {
connect(project, SIGNAL(buildSystemEvaluated()), SLOT(createModels())); connect(project, SIGNAL(proFilesEvaluated()), SLOT(createModels()));
setInstallPrefix(installPrefix); setInstallPrefix(installPrefix);
} }
@@ -89,13 +89,13 @@ void DeploymentInfo::createModels()
const Qt4ProFileNode *const rootNode = d->project->rootQt4ProjectNode(); const Qt4ProFileNode *const rootNode = d->project->rootQt4ProjectNode();
if (!rootNode || rootNode->parseInProgress()) // Can be null right after project creation by wizard. if (!rootNode || rootNode->parseInProgress()) // Can be null right after project creation by wizard.
return; return;
disconnect(d->project, SIGNAL(buildSystemEvaluated()), this, SLOT(createModels())); disconnect(d->project, SIGNAL(proFilesEvaluated()), this, SLOT(createModels()));
beginResetModel(); beginResetModel();
qDeleteAll(d->listModels); qDeleteAll(d->listModels);
d->listModels.clear(); d->listModels.clear();
createModels(rootNode); createModels(rootNode);
endResetModel(); endResetModel();
connect (d->project, SIGNAL(buildSystemEvaluated()), SLOT(createModels())); connect (d->project, SIGNAL(proFilesEvaluated()), SLOT(createModels()));
} }
void DeploymentInfo::createModels(const Qt4ProFileNode *proFileNode) void DeploymentInfo::createModels(const Qt4ProFileNode *proFileNode)