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

Treat .ui.qml mime type the same as .qml

Browse Source 
Right now, the qmake project manager offers a "Build" context menu entry
for .ui.qml files and various other things are off because the mime
types are different.

Change-Id: Icc966e56513b9c5aed05f929dc8cb728ed408723
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Ulf Hermann
2017-10-17 18:53:28 +02:00
parent 371b2bbbab
commit e902980dde
8 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -265,8 +265,12 @@ void QmlProjectRunConfiguration::updateEnabledState()
Utils::MimeType mainScriptMimeType = Utils::mimeTypeForFile(mainScript());
if (document) {
m_currentFileFilename = document->filePath().toString();
if (mainScriptMimeType.matchesName(QLatin1String(ProjectExplorer::Constants::QML_MIMETYPE)))
if (mainScriptMimeType.matchesName(
QLatin1String(ProjectExplorer::Constants::QML_MIMETYPE))
|| mainScriptMimeType.matchesName(
QLatin1String(ProjectExplorer::Constants::QMLUI_MIMETYPE))) {
qmlFileFound = true;
}
}
if (!document
|| mainScriptMimeType.matchesName(QLatin1String(QmlJSTools::Constants::QMLPROJECT_MIMETYPE))) {
@@ -275,12 +279,15 @@ void QmlProjectRunConfiguration::updateEnabledState()
foreach (const QString &filename, target()->project()->files(Project::AllFiles)) {
const QFileInfo fi(filename);
if (!filename.isEmpty() && fi.baseName()[0].isLower()
&& Utils::mimeTypeForFile(fi).matchesName(QLatin1String(ProjectExplorer::Constants::QML_MIMETYPE)))
{
m_currentFileFilename = filename;
qmlFileFound = true;
break;
if (!filename.isEmpty() && fi.baseName()[0].isLower()) {
Utils::MimeType type = Utils::mimeTypeForFile(fi);
if (type.matchesName(QLatin1String(ProjectExplorer::Constants::QML_MIMETYPE))
|| type.matchesName(
QLatin1String(ProjectExplorer::Constants::QMLUI_MIMETYPE))) {
m_currentFileFilename = filename;
qmlFileFound = true;
break;
}
}
}