diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-11-29 12:59:51 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-11-29 13:36:14 +0100 |
| commit | 29c9f8080d2e2ad6ad9573612b0ea171c22d737a (patch) | |
| tree | 7d811167b3992eb5c35f09599c27faa8e225f2d6 /src/plugins/qmljstools | |
| parent | ba4c43421126c02e34d5cf3ed25bb290c79e6343 (diff) | |
| parent | 9eb66a806f098b84c22654da5aeb62a9db8e8c59 (diff) | |
| download | qt-creator-29c9f8080d2e2ad6ad9573612b0ea171c22d737a.tar.gz | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
src/plugins/android/androidrunnerworker.cpp
Change-Id: Ibd8b99435365fb7e7d488313fd1d2b3a75adad1b
Diffstat (limited to 'src/plugins/qmljstools')
| -rw-r--r-- | src/plugins/qmljstools/QmlJSTools.json.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/qmljstools/QmlJSTools.json.in b/src/plugins/qmljstools/QmlJSTools.json.in index 0a1d994580..0902c0ec9e 100644 --- a/src/plugins/qmljstools/QmlJSTools.json.in +++ b/src/plugins/qmljstools/QmlJSTools.json.in @@ -57,6 +57,11 @@ \" <comment>JSON file</comment>\", \" <glob pattern=\'*.json\' weight=\'70\'/>\", \" </mime-type>\", + \" <mime-type type=\'application/x-javascript-module\'>\", + \" <sub-class-of type=\'application/javascript\'/>\", + \" <comment>Javascript module</comment>\", + \" <glob pattern=\'*.mjs\' weight=\'70\'/>\", + \" </mime-type>\", \"</mime-info>\" ] } |