From 01592d60d6eb780034de17e1d50658b58dfe35c3 Mon Sep 17 00:00:00 2001 From: dt Date: Thu, 18 Nov 2010 18:18:54 +0100 Subject: [PATCH] FlatModel: forgotten change + compile on windows --- src/plugins/projectexplorer/projectmodels.cpp | 2 +- src/plugins/qt4projectmanager/qt4nodes.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index f7440b53bc8..e849bc85854 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -145,7 +145,7 @@ FlatModel::FlatModel(SessionNode *rootNode, QObject *parent) NodesWatcher *watcher = new NodesWatcher(this); m_rootNode->registerWatcher(watcher); - connect(watcher, SIGNAL(aboutToHasBuildTargetsChanged(ProjectExplorer::ProjectNode*)), + connect(watcher, SIGNAL(aboutToChangeHasBuildTargets(ProjectExplorer::ProjectNode*)), this, SLOT(aboutToHasBuildTargetsChanged(ProjectExplorer::ProjectNode*))); connect(watcher, SIGNAL(hasBuildTargetsChanged(ProjectExplorer::ProjectNode*)), diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index 317bdd2f854..26e40c0622c 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -1481,7 +1481,7 @@ void Qt4ProFileNode::applyEvaluate(bool parseResult, bool async) Qt4ProjectType oldType = m_projectType; // probably all subfiles/projects have changed anyway ... clear(); - bool changesHasBuildTargets = hasBuildTargets() xor hasBuildTargets(projectType); + bool changesHasBuildTargets = hasBuildTargets() ^ hasBuildTargets(projectType); if (changesHasBuildTargets) aboutToChangeHasBuildTargets();