forked from qt-creator/qt-creator
QmlProjectMananger: Remove a use of mimeType via QFileInfo
And a bit cosmetics. Change-Id: I3e64b661d86cadad22422c2bffad0ed1262283b4 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
@@ -27,7 +27,6 @@
|
|||||||
|
|
||||||
#include "qmlproject.h"
|
#include "qmlproject.h"
|
||||||
#include "qmlprojectmanagerconstants.h"
|
#include "qmlprojectmanagerconstants.h"
|
||||||
#include "qmlprojectrunconfiguration.h"
|
|
||||||
|
|
||||||
#include <qmljstools/qmljstoolsconstants.h>
|
#include <qmljstools/qmljstoolsconstants.h>
|
||||||
|
|
||||||
@@ -75,7 +74,7 @@ QmlMainFileAspect::~QmlMainFileAspect()
|
|||||||
delete m_fileListCombo;
|
delete m_fileListCombo;
|
||||||
}
|
}
|
||||||
|
|
||||||
void QmlMainFileAspect::addToLayout(Utils::LayoutBuilder &builder)
|
void QmlMainFileAspect::addToLayout(LayoutBuilder &builder)
|
||||||
{
|
{
|
||||||
QTC_ASSERT(!m_fileListCombo, delete m_fileListCombo);
|
QTC_ASSERT(!m_fileListCombo, delete m_fileListCombo);
|
||||||
m_fileListCombo = new QComboBox;
|
m_fileListCombo = new QComboBox;
|
||||||
@@ -238,7 +237,7 @@ bool QmlMainFileAspect::isQmlFilePresent()
|
|||||||
bool qmlFileFound = false;
|
bool qmlFileFound = false;
|
||||||
if (mainScriptSource() == FileInEditor) {
|
if (mainScriptSource() == FileInEditor) {
|
||||||
IDocument *document = EditorManager::currentDocument();
|
IDocument *document = EditorManager::currentDocument();
|
||||||
Utils::MimeType mainScriptMimeType = Utils::mimeTypeForFile(mainScript());
|
const MimeType mainScriptMimeType = mimeTypeForFile(mainScript());
|
||||||
if (document) {
|
if (document) {
|
||||||
m_currentFileFilename = document->filePath().toString();
|
m_currentFileFilename = document->filePath().toString();
|
||||||
if (mainScriptMimeType.matchesName(ProjectExplorer::Constants::QML_MIMETYPE)
|
if (mainScriptMimeType.matchesName(ProjectExplorer::Constants::QML_MIMETYPE)
|
||||||
@@ -251,11 +250,9 @@ bool QmlMainFileAspect::isQmlFilePresent()
|
|||||||
// find a qml file with lowercase filename. This is slow, but only done
|
// find a qml file with lowercase filename. This is slow, but only done
|
||||||
// in initialization/other border cases.
|
// in initialization/other border cases.
|
||||||
const auto files = m_target->project()->files(Project::SourceFiles);
|
const auto files = m_target->project()->files(Project::SourceFiles);
|
||||||
for (const Utils::FilePath &filename : files) {
|
for (const FilePath &filename : files) {
|
||||||
const QFileInfo fi = filename.toFileInfo();
|
if (!filename.isEmpty() && filename.baseName().at(0).isLower()) {
|
||||||
|
const MimeType type = mimeTypeForFile(filename);
|
||||||
if (!filename.isEmpty() && fi.baseName().at(0).isLower()) {
|
|
||||||
Utils::MimeType type = Utils::mimeTypeForFile(fi);
|
|
||||||
if (type.matchesName(ProjectExplorer::Constants::QML_MIMETYPE)
|
if (type.matchesName(ProjectExplorer::Constants::QML_MIMETYPE)
|
||||||
|| type.matchesName(ProjectExplorer::Constants::QMLUI_MIMETYPE)) {
|
|| type.matchesName(ProjectExplorer::Constants::QMLUI_MIMETYPE)) {
|
||||||
m_currentFileFilename = filename.toString();
|
m_currentFileFilename = filename.toString();
|
||||||
|
Reference in New Issue
Block a user