Merge remote-tracking branch 'origin/4.11'

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

1 files changed, 16 insertions, 7 deletions

diff --git a/src/plugins/python/pythonproject.cpp b/src/plugins/python/pythonproject.cpp
index e51332fd99..d74bedea0e 100644
--- a/src/plugins/python/pythonproject.cpp
+++ b/src/plugins/python/pythonproject.cpp
@@ -193,6 +193,21 @@ PythonProject::PythonProject(const FilePath &fileName)
     setBuildSystemCreator([](Target *t) { return new PythonBuildSystem(t); });
 }
 
+static FileType getFileType(const FilePath &f)
+{
+    if (f.endsWith(".py"))
+        return FileType::Source;
+    if (f.endsWith(".pyproject") || f.endsWith(".pyqtc"))
+        return FileType::Project;
+    if (f.endsWith(".qrc"))
+        return FileType::Resource;
+    if (f.endsWith(".ui"))
+        return FileType::Form;
+    if (f.endsWith(".qml") || f.endsWith(".js"))
+        return FileType::QML;
+    return Node::fileTypeForFileName(f);
+}
+
 void PythonBuildSystem::triggerParsing()
 {
     ParseGuard guard = guardParsingRun();
@@ -205,13 +220,7 @@ void PythonBuildSystem::triggerParsing()
     for (const QString &f : qAsConst(m_files)) {
         const QString displayName = baseDir.relativeFilePath(f);
         const FilePath filePath = FilePath::fromString(f);
-        FileType fileType;
-        if (f.endsWith(".py"))
-            fileType = FileType::Source;
-        else if (f.endsWith(".pyproject") || f.endsWith(".pyqtc"))
-            fileType = FileType::Project;
-        else
-            fileType = Node::fileTypeForFileName(filePath);
+        const FileType fileType = getFileType(filePath);
 
         newRoot->addNestedNode(std::make_unique<PythonFileNode>(filePath, displayName, fileType));
         if (fileType == FileType::Source) {