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

UiCodemodel support for qbs

Browse Source 
Change-Id: I0c83f3bb5c1c127169d695f42c169f4e28d1b06d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-08-07 12:29:52 +02:00
parent 97d76b8cbf
commit 27b4802988
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,7 @@
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <projectexplorer/headerpath.h> #include <projectexplorer/headerpath.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <qtsupport/uicodemodelsupport.h>
#include <qmljstools/qmljsmodelmanager.h> #include <qmljstools/qmljsmodelmanager.h>
#include <qmljs/qmljsmodelmanagerinterface.h> #include <qmljs/qmljsmodelmanagerinterface.h>
@@ -527,6 +528,7 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData &prj)
qtVersionForPart = CppTools::ProjectPart::Qt5; qtVersionForPart = CppTools::ProjectPart::Qt5;
} }
QHash<QString, QString> uiFiles;
QStringList allFiles; QStringList allFiles;
foreach (const qbs::ProductData &prd, prj.allProducts()) { foreach (const qbs::ProductData &prd, prj.allProducts()) {
foreach (const qbs::GroupData &grp, prd.groups()) { foreach (const qbs::GroupData &grp, prd.groups()) {
@@ -578,9 +580,16 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData &prj)
ProjectExplorer::SysRootKitInformation::sysRoot(k)); ProjectExplorer::SysRootKitInformation::sysRoot(k));
CppTools::ProjectFileAdder adder(part->files); CppTools::ProjectFileAdder adder(part->files);
foreach (const QString &file, grp.allFilePaths()) foreach (const QString &file, grp.allFilePaths()) {
if (file.endsWith(QLatin1String(".ui"))) {
QStringList generated = m_rootProjectNode->qbsProject()
->generatedFiles(prd, file, QStringList(QLatin1String("hpp")));
if (generated.count() == 1)
uiFiles.insert(file, generated.at(0));
}
if (adder.maybeAdd(file)) if (adder.maybeAdd(file))
allFiles.append(file); allFiles.append(file);
}
part->files << CppTools::ProjectFile(QLatin1String(CONFIGURATION_PATH), part->files << CppTools::ProjectFile(QLatin1String(CONFIGURATION_PATH),
CppTools::ProjectFile::CXXHeader); CppTools::ProjectFile::CXXHeader);
@@ -598,6 +607,8 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData &prj)
if (pinfo.projectParts().isEmpty()) if (pinfo.projectParts().isEmpty())
return; return;
QtSupport::UiCodeModelManager::update(this, uiFiles);
// Register update the code model: // Register update the code model:
m_codeModelFuture = modelmanager->updateProjectInfo(pinfo); m_codeModelFuture = modelmanager->updateProjectInfo(pinfo);
} }