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

Merge remote-tracking branch 'origin/4.11'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/mcusupport/mcusupportrunconfiguration.cpp
	src/plugins/python/pythonproject.cpp
	src/plugins/qmakeprojectmanager/qmakestep.cpp
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I22507be28fd80c49c9fee0dff5937a40db176a82
This commit is contained in:
Orgad Shaneh
2019-12-06 13:04:17 +02:00
parent 3c41b91d44 9eed77fe86
commit 49f6b0146a
145 changed files with 2761 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -391,6 +391,8 @@ QVariant QmlBuildSystem::additionalData(Id id) const
{
if (id == Constants::customFileSelectorsData)
return customFileSelectors();
if (id == Constants::customForceFreeTypeData)
return forceFreeType();
return {};
}
@@ -418,6 +420,13 @@ QmlProject *QmlBuildSystem::qmlProject() const
return static_cast<QmlProject *>(BuildSystem::project());
}
bool QmlBuildSystem::forceFreeType() const
{
if (m_projectItem)
return m_projectItem.data()->forceFreeType();
return false;
}
bool QmlBuildSystem::addFiles(Node *context, const QStringList &filePaths, QStringList *)
{
if (!dynamic_cast<QmlProjectNode *>(context))