forked from qt-creator/qt-creator
QbsProject: Remove unread attribute
Also remove the signal CppProjectUpdater::projectInfoUpdated() which is now unused. Change-Id: I65afe8f96cd8175edaf8ccb6e5067e4f9cd8d99f Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
@@ -100,10 +100,6 @@ void CppProjectUpdater::onProjectInfoGenerated()
|
|||||||
QFuture<void> future = CppModelManager::instance()
|
QFuture<void> future = CppModelManager::instance()
|
||||||
->updateProjectInfo(m_futureInterface, m_generateFutureWatcher.result());
|
->updateProjectInfo(m_futureInterface, m_generateFutureWatcher.result());
|
||||||
QTC_CHECK(future != QFuture<void>());
|
QTC_CHECK(future != QFuture<void>());
|
||||||
|
|
||||||
const ProjectInfo projectInfo = CppModelManager::instance()->projectInfo(m_project);
|
|
||||||
QTC_CHECK(projectInfo.isValid());
|
|
||||||
emit projectInfoUpdated(projectInfo);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace CppTools
|
} // namespace CppTools
|
||||||
|
@@ -49,9 +49,6 @@ public:
|
|||||||
void update(const ProjectUpdateInfo &projectUpdateInfo);
|
void update(const ProjectUpdateInfo &projectUpdateInfo);
|
||||||
void cancel();
|
void cancel();
|
||||||
|
|
||||||
signals:
|
|
||||||
void projectInfoUpdated(const ProjectInfo &projectInfo);
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void cancelAndWaitForFinished();
|
void cancelAndWaitForFinished();
|
||||||
|
|
||||||
|
@@ -154,11 +154,6 @@ QbsProject::QbsProject(const FileName &fileName) :
|
|||||||
subscribeSignal(&Target::activeBuildConfigurationChanged, this, delayedParsing);
|
subscribeSignal(&Target::activeBuildConfigurationChanged, this, delayedParsing);
|
||||||
|
|
||||||
connect(&m_parsingDelay, &QTimer::timeout, this, &QbsProject::startParsing);
|
connect(&m_parsingDelay, &QTimer::timeout, this, &QbsProject::startParsing);
|
||||||
|
|
||||||
connect(m_cppCodeModelUpdater, &CppTools::CppProjectUpdater::projectInfoUpdated, this,
|
|
||||||
[this](const CppTools::ProjectInfo &projectInfo){
|
|
||||||
m_cppCodeModelProjectInfo = projectInfo;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QbsProject::~QbsProject()
|
QbsProject::~QbsProject()
|
||||||
|
@@ -29,8 +29,6 @@
|
|||||||
|
|
||||||
#include "qbsnodes.h"
|
#include "qbsnodes.h"
|
||||||
|
|
||||||
#include <cpptools/projectinfo.h>
|
|
||||||
|
|
||||||
#include <projectexplorer/extracompiler.h>
|
#include <projectexplorer/extracompiler.h>
|
||||||
#include <projectexplorer/project.h>
|
#include <projectexplorer/project.h>
|
||||||
#include <projectexplorer/projectnodes.h>
|
#include <projectexplorer/projectnodes.h>
|
||||||
@@ -159,7 +157,6 @@ private:
|
|||||||
} m_cancelStatus = CancelStatusNone;
|
} m_cancelStatus = CancelStatusNone;
|
||||||
|
|
||||||
CppTools::CppProjectUpdater *m_cppCodeModelUpdater = nullptr;
|
CppTools::CppProjectUpdater *m_cppCodeModelUpdater = nullptr;
|
||||||
CppTools::ProjectInfo m_cppCodeModelProjectInfo;
|
|
||||||
|
|
||||||
mutable ProjectExplorer::ProjectImporter *m_importer = nullptr;
|
mutable ProjectExplorer::ProjectImporter *m_importer = nullptr;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user