forked from qt-creator/qt-creator
Fix build of ProjectExplorer with g++ 4.8.2.
The compiler is unable to match the arguments of the connect statement when a QPointer is involved. Change-Id: I87d3c11b9452f07739bf4e905a18071145c4e21d Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
@@ -220,9 +220,9 @@ void ProjectTree::update(Node *node, Project *project)
|
|||||||
{
|
{
|
||||||
if (project != m_currentProject) {
|
if (project != m_currentProject) {
|
||||||
if (m_currentProject) {
|
if (m_currentProject) {
|
||||||
disconnect(m_currentProject, &Project::projectContextUpdated,
|
disconnect(m_currentProject.data(), &Project::projectContextUpdated,
|
||||||
this, &ProjectTree::updateContext);
|
this, &ProjectTree::updateContext);
|
||||||
disconnect(m_currentProject, &Project::projectLanguagesUpdated,
|
disconnect(m_currentProject.data(), &Project::projectLanguagesUpdated,
|
||||||
this, &ProjectTree::updateContext);
|
this, &ProjectTree::updateContext);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -230,9 +230,9 @@ void ProjectTree::update(Node *node, Project *project)
|
|||||||
emit currentProjectChanged(m_currentProject);
|
emit currentProjectChanged(m_currentProject);
|
||||||
|
|
||||||
if (m_currentProject) {
|
if (m_currentProject) {
|
||||||
connect(m_currentProject, &Project::projectContextUpdated,
|
connect(m_currentProject.data(), &Project::projectContextUpdated,
|
||||||
this, &ProjectTree::updateContext);
|
this, &ProjectTree::updateContext);
|
||||||
connect(m_currentProject, &Project::projectLanguagesUpdated,
|
connect(m_currentProject.data(), &Project::projectLanguagesUpdated,
|
||||||
this, &ProjectTree::updateContext);
|
this, &ProjectTree::updateContext);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user