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

Qbs: Make use of buildSystemFiles

Browse Source 
Change-Id: I1d7151cd0aa6388c5d7fe20dbc4ed2a154325e1a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-06-18 15:52:29 +02:00
parent cf9d340a67
commit 9368a82eaa
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -120,7 +120,7 @@ QbsProject::QbsProject(QbsManager *manager, const QString &fileName) :
connect(&m_parsingDelay, SIGNAL(timeout()), this, SLOT(parseCurrentBuildConfiguration())); connect(&m_parsingDelay, SIGNAL(timeout()), this, SLOT(parseCurrentBuildConfiguration()));
updateDocuments(0); updateDocuments(QSet<QString>() << fileName);
m_rootProjectNode = new QbsProjectNode(this); // needs documents to be initialized! m_rootProjectNode = new QbsProjectNode(this); // needs documents to be initialized!
} }
@@ -282,7 +282,7 @@ void QbsProject::handleQbsParsingDone(bool success)
m_rootProjectNode->update(project); m_rootProjectNode->update(project);
updateDocuments(m_rootProjectNode->qbsProjectData()); updateDocuments(project ? project->buildSystemFiles() : QSet<QString>() << m_fileName);
updateCppCodeModel(m_rootProjectNode->qbsProjectData()); updateCppCodeModel(m_rootProjectNode->qbsProjectData());
updateQmlJsCodeModel(m_rootProjectNode->qbsProjectData()); updateQmlJsCodeModel(m_rootProjectNode->qbsProjectData());
@@ -465,17 +465,11 @@ void QbsProject::prepareForParsing()
m_qbsUpdateFutureInterface->reportStarted(); m_qbsUpdateFutureInterface->reportStarted();
} }
void QbsProject::updateDocuments(const qbs::ProjectData *prj) void QbsProject::updateDocuments(const QSet<QString> &files)
{ {
// Update documents: // Update documents:
QSet<QString> newFiles; QSet<QString> newFiles = files;
newFiles.insert(m_fileName); // make sure we always have the project file... QTC_ASSERT(!newFiles.isEmpty(), newFiles << m_fileName);
if (prj) {
newFiles.insert(prj->location().fileName());
foreach (const qbs::ProductData &prd, prj->products())
newFiles.insert(prd.location().fileName());
}
QSet<QString> oldFiles; QSet<QString> oldFiles;
foreach (Core::IDocument *doc, m_qbsDocuments) foreach (Core::IDocument *doc, m_qbsDocuments)
oldFiles.insert(doc->fileName()); oldFiles.insert(doc->fileName());

2
src/plugins/qbsprojectmanager/qbsproject.h
View File

@@ -122,7 +122,7 @@ private:
void generateErrors(const qbs::ErrorInfo &e); void generateErrors(const qbs::ErrorInfo &e);
void prepareForParsing(); void prepareForParsing();
void updateDocuments(const qbs::ProjectData *prj); void updateDocuments(const QSet<QString> &files);
void updateCppCodeModel(const qbs::ProjectData *prj); void updateCppCodeModel(const qbs::ProjectData *prj);
void updateQmlJsCodeModel(const qbs::ProjectData *prj); void updateQmlJsCodeModel(const qbs::ProjectData *prj);
QString qbsBuildDir() const; QString qbsBuildDir() const;

2
src/shared/qbs

Submodule src/shared/qbs updated: 36c7dba4ae...22a2777a89