Merge remote-tracking branch 'origin/4.12'

Conflicts:
	src/plugins/coreplugin/dialogs/shortcutsettings.cpp

Change-Id: I1f21845350bb69268ca51bc77167a8244adce22a

src/plugins/qmljstools/QmlJSTools.json.in

@@ -62,6 +62,13 @@
         \"        <comment>Javascript module</comment>\",
         \"        <glob pattern=\'*.mjs\' weight=\'70\'/>\",
         \"    </mime-type>\",
+        \"    <mime-type type=\'text/x-qtscript\'>\",
+        \"        <alias type=\'application/x-qtscript\'/>\",
+        \"        <sub-class-of type=\'application/javascript\'/>\",
+        \"        <comment>Qt Script file</comment>\",
+        \"        <glob pattern=\'*.qs\' weight=\'70\'/>\",
+        \"    </mime-type>\",
         \"</mime-info>\"
     ]
+
 }