aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@qt.io>2016-12-19 16:43:01 +0100
committerKarsten Heimrich <karsten.heimrich@qt.io>2016-12-20 10:05:31 +0000
commit5992823f78fea1bfd8e66f549653c7ea6b0abd1c (patch)
tree129c4f0339a4d340c0df6b1b92953e11a39ff0ca
parentfcf2e5f95af39bb94f6e6e103e50d00f931ea12e (diff)
Fix broken QML classifier implementation
Change-Id: I581a267463ca6a41ac505e6773c0eb1f1bc153ef Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
-rw-r--r--src/qtvstools/ClassifierProvider.cs2
-rw-r--r--src/qtvstools/ContentTypeDefinition.cs14
2 files changed, 12 insertions, 4 deletions
diff --git a/src/qtvstools/ClassifierProvider.cs b/src/qtvstools/ClassifierProvider.cs
index 47707adb..f58bee92 100644
--- a/src/qtvstools/ClassifierProvider.cs
+++ b/src/qtvstools/ClassifierProvider.cs
@@ -38,7 +38,7 @@ namespace QtVsTools
/// This class causes a classifier to be added to the set of classifiers.
/// </summary>
[Export(typeof(IClassifierProvider))]
- [ContentType(ContentTypeDefinition.ContentType)]
+ [ContentType(QmlContentTypeDefinition.ContentType)]
internal class ClassifierProvider : IClassifierProvider
{
[Import(typeof(SVsServiceProvider))]
diff --git a/src/qtvstools/ContentTypeDefinition.cs b/src/qtvstools/ContentTypeDefinition.cs
index 6062d264..29606ba5 100644
--- a/src/qtvstools/ContentTypeDefinition.cs
+++ b/src/qtvstools/ContentTypeDefinition.cs
@@ -31,7 +31,7 @@ using System.ComponentModel.Composition;
namespace QtVsTools
{
- public sealed class ContentTypeDefinition
+ public sealed class QmlContentTypeDefinition
{
public const string ContentType = "Qml";
@@ -39,7 +39,7 @@ namespace QtVsTools
/// Exports the Qml content type
/// </summary>
[Export(typeof(ContentTypeDefinition))]
- [Name(ContentTypeDefinition.ContentType)]
+ [Name(ContentType)]
[BaseDefinition("code")]
public ContentTypeDefinition QmlContentType { get; set; }
@@ -47,8 +47,16 @@ namespace QtVsTools
/// Exports the Qml file extension
/// </summary>
[Export(typeof(FileExtensionToContentTypeDefinition))]
- [ContentType(ContentTypeDefinition.ContentType)]
+ [ContentType(ContentType)]
[FileExtension(".qml")]
public FileExtensionToContentTypeDefinition QmlFileExtension { get; set; }
+
+ /// <summary>
+ /// Exports the Qml project file extension
+ /// </summary>
+ [Export(typeof(FileExtensionToContentTypeDefinition))]
+ [ContentType(ContentType)]
+ [FileExtension(".qmlproject")]
+ public FileExtensionToContentTypeDefinition QmlProjectFileExtension { get; set; }
}
}