aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2017-07-21 14:50:23 +0200
committerEike Ziller <eike.ziller@qt.io>2017-07-25 06:00:49 +0000
commite8e46ab553bce9aac9adcaf2ac4ee1207b69ac93 (patch)
tree32bf7963c0d7d71309b62026e01f8586fffe5aee /src
parent5df0f97d2f4f90decbc2fb263704755857416846 (diff)
Plugins: Fix that mimetype definition was not valid JSON
JSON officially does not support multiline strings, so we should use the same mechanism that we already use for the plugin description (i.e. additionally support arrays of strings which are interpreted as lines). This just happens to work because Qt's JSON parser eats it without choking. Change-Id: I25ef04600b209775c5a7af916c687fda4a8b1a4d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/libs/extensionsystem/pluginspec.cpp12
-rw-r--r--src/libs/extensionsystem/pluginspec.h2
-rw-r--r--src/plugins/android/Android.json.in20
-rw-r--r--src/plugins/clearcase/ClearCase.json.in18
-rw-r--r--src/plugins/cmakeprojectmanager/CMakeProjectManager.json.in30
-rw-r--r--src/plugins/coreplugin/coreplugin.cpp5
-rw-r--r--src/plugins/cpptools/CppTools.json.in176
-rw-r--r--src/plugins/cvs/CVS.json.in18
-rw-r--r--src/plugins/debugger/Debugger.json.in32
-rw-r--r--src/plugins/genericprojectmanager/GenericProjectManager.json.in50
-rw-r--r--src/plugins/git/Git.json.in32
-rw-r--r--src/plugins/glsleditor/GLSLEditor.json.in74
-rw-r--r--src/plugins/imageviewer/ImageViewer.json.in18
-rw-r--r--src/plugins/modeleditor/ModelEditor.json.in20
-rw-r--r--src/plugins/nim/Nim.json.in40
-rw-r--r--src/plugins/perforce/Perforce.json.in24
-rw-r--r--src/plugins/pythoneditor/PythonEditor.json.in30
-rw-r--r--src/plugins/qmakeprojectmanager/QmakeProjectManager.json.in70
-rw-r--r--src/plugins/qmljstools/QmlJSTools.json.in82
-rw-r--r--src/plugins/qmlprojectmanager/QmlProjectManager.json.in20
-rw-r--r--src/plugins/qtsupport/QtSupport.json.in42
-rw-r--r--src/plugins/resourceeditor/ResourceEditor.json.in20
-rw-r--r--src/plugins/scxmleditor/ScxmlEditor.json.in20
-rw-r--r--src/plugins/subversion/Subversion.json.in18
-rw-r--r--src/plugins/tasklist/TaskList.json.in22
25 files changed, 448 insertions, 447 deletions
diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp
index 19be010c4d..cde1903099 100644
--- a/src/libs/extensionsystem/pluginspec.cpp
+++ b/src/libs/extensionsystem/pluginspec.cpp
@@ -31,6 +31,7 @@
#include "pluginmanager.h"
#include <utils/algorithm.h>
+#include <utils/qtcassert.h>
#include <QCoreApplication>
#include <QDebug>
@@ -630,12 +631,9 @@ static inline QString msgInvalidFormat(const char *key, const QString &content)
.arg(QLatin1String(key), content);
}
-static inline bool readMultiLineString(const QJsonValue &value, QString *out)
+bool PluginSpec::readMultiLineString(const QJsonValue &value, QString *out)
{
- if (!out) {
- qCWarning(pluginLog) << Q_FUNC_INFO << "missing output parameter";
- return false;
- }
+ QTC_ASSERT(out, return false);
if (value.isString()) {
*out = value.toString();
} else if (value.isArray()) {
@@ -737,7 +735,7 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
copyright = value.toString();
value = metaData.value(QLatin1String(DESCRIPTION));
- if (!value.isUndefined() && !readMultiLineString(value, &description))
+ if (!value.isUndefined() && !PluginSpec::readMultiLineString(value, &description))
return reportError(msgValueIsNotAString(DESCRIPTION));
value = metaData.value(QLatin1String(URL));
@@ -751,7 +749,7 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
category = value.toString();
value = metaData.value(QLatin1String(LICENSE));
- if (!value.isUndefined() && !readMultiLineString(value, &license))
+ if (!value.isUndefined() && !PluginSpec::readMultiLineString(value, &license))
return reportError(msgValueIsNotAMultilineString(LICENSE));
value = metaData.value(QLatin1String(PLATFORM));
diff --git a/src/libs/extensionsystem/pluginspec.h b/src/libs/extensionsystem/pluginspec.h
index 0462acddef..da89ff6029 100644
--- a/src/libs/extensionsystem/pluginspec.h
+++ b/src/libs/extensionsystem/pluginspec.h
@@ -131,6 +131,8 @@ public:
bool hasError() const;
QString errorString() const;
+ static bool readMultiLineString(const QJsonValue &value, QString *out);
+
private:
PluginSpec();
diff --git a/src/plugins/android/Android.json.in b/src/plugins/android/Android.json.in
index 43268da1c2..eda39dd3a2 100644
--- a/src/plugins/android/Android.json.in
+++ b/src/plugins/android/Android.json.in
@@ -17,14 +17,14 @@
\"Url\" : \"http://necessitas.kde.org\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'application/vnd.google.android.android_manifest\'>
- <comment>Android manifest file</comment>
- <sub-class-of type=\'application/xml\'/>
- <glob pattern=\'AndroidManifest.xml\'/>
- </mime-type>
- </mime-info>
- \"
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'application/vnd.google.android.android_manifest\'>\",
+ \" <comment>Android manifest file</comment>\",
+ \" <sub-class-of type=\'application/xml\'/>\",
+ \" <glob pattern=\'AndroidManifest.xml\'/>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/clearcase/ClearCase.json.in b/src/plugins/clearcase/ClearCase.json.in
index b9153225d7..24384b8ab6 100644
--- a/src/plugins/clearcase/ClearCase.json.in
+++ b/src/plugins/clearcase/ClearCase.json.in
@@ -19,13 +19,13 @@
\"Url\" : \"http://www.qt.io\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'application/vnd.audc.text.clearcase.submit\'>
- <comment>ClearCase submit template</comment>
- <sub-class-of type=\'text/plain\'/>
- </mime-type>
- </mime-info>
- \"
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'application/vnd.audc.text.clearcase.submit\'>\",
+ \" <comment>ClearCase submit template</comment>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/cmakeprojectmanager/CMakeProjectManager.json.in b/src/plugins/cmakeprojectmanager/CMakeProjectManager.json.in
index 5d75c622a8..5bf0dc4ad5 100644
--- a/src/plugins/cmakeprojectmanager/CMakeProjectManager.json.in
+++ b/src/plugins/cmakeprojectmanager/CMakeProjectManager.json.in
@@ -17,19 +17,19 @@
\"Url\" : \"http://www.qt.io\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'text/x-cmake\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>CMake Project file</comment>
- <glob pattern=\'*.cmake\'/>
- </mime-type>
- <mime-type type=\'text/x-cmake-project\'>
- <sub-class-of type=\'text/x-cmake\'/>
- <comment>CMake Project file</comment>
- <glob pattern=\'CMakeLists.txt\'/>
- </mime-type>
- </mime-info>
- \"
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'text/x-cmake\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>CMake Project file</comment>\",
+ \" <glob pattern=\'*.cmake\'/>\",
+ \" </mime-type>\",
+ \" <mime-type type=\'text/x-cmake-project\'>\",
+ \" <sub-class-of type=\'text/x-cmake\'/>\",
+ \" <comment>CMake Project file</comment>\",
+ \" <glob pattern=\'CMakeLists.txt\'/>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index fed19490ca..a51d418a6c 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -131,8 +131,9 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
continue;
const QJsonObject metaData = plugin->metaData();
const QJsonValue mimetypes = metaData.value("Mimetypes");
- if (mimetypes.isString())
- Utils::addMimeTypes(plugin->name() + ".mimetypes", mimetypes.toString().trimmed().toUtf8());
+ QString mimetypeString;
+ if (ExtensionSystem::PluginSpec::readMultiLineString(mimetypes, &mimetypeString))
+ Utils::addMimeTypes(plugin->name() + ".mimetypes", mimetypeString.trimmed().toUtf8());
}
if (ThemeEntry::availableThemes().isEmpty()) {
diff --git a/src/plugins/cpptools/CppTools.json.in b/src/plugins/cpptools/CppTools.json.in
index a9af2e54d6..c95a262683 100644
--- a/src/plugins/cpptools/CppTools.json.in
+++ b/src/plugins/cpptools/CppTools.json.in
@@ -18,101 +18,101 @@
\"Url\" : \"http://www.qt.io\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\' encoding=\'UTF-8\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'text/x-csrc\'>
- <comment>C source code</comment>
- <sub-class-of type=\'text/plain\'/>
- <alias type=\'text/x-c\'/>
- <glob pattern=\'*.c\' case-sensitive=\'true\' weight=\'70\'/>
- </mime-type>
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\' encoding=\'UTF-8\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'text/x-csrc\'>\",
+ \" <comment>C source code</comment>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <alias type=\'text/x-c\'/>\",
+ \" <glob pattern=\'*.c\' case-sensitive=\'true\' weight=\'70\'/>\",
+ \" </mime-type>\",
- <mime-type type=\'text/vnd.nvidia.cuda.csrc\'>
- <sub-class-of type=\'text/x-csrc\'/>
- <comment>NVIDIA CUDA C source code</comment>
- <glob pattern=\'*.cu\'/>
- </mime-type>
+ \" <mime-type type=\'text/vnd.nvidia.cuda.csrc\'>\",
+ \" <sub-class-of type=\'text/x-csrc\'/>\",
+ \" <comment>NVIDIA CUDA C source code</comment>\",
+ \" <glob pattern=\'*.cu\'/>\",
+ \" </mime-type>\",
- <mime-type type=\'text/x-chdr\'>
- <comment>C header</comment>
- <sub-class-of type=\'text/x-csrc\'/>
- <!-- reduce weight from freedesktop to avoid conflict with text/x-c++hdr -->
- <glob pattern=\'*.h\' weight=\'30\'/>
- </mime-type>
+ \" <mime-type type=\'text/x-chdr\'>\",
+ \" <comment>C header</comment>\",
+ \" <sub-class-of type=\'text/x-csrc\'/>\",
+ \" <!-- reduce weight from freedesktop to avoid conflict with text/x-c++hdr -->\",
+ \" <glob pattern=\'*.h\' weight=\'30\'/>\",
+ \" </mime-type>\",
- <!-- Those are used to find matching headers by the CppTools plugin,
- so, they should match -->
- <mime-type type=\'text/x-c++hdr\'>
- <sub-class-of type=\'text/x-chdr\'/>
- <comment>C++ header</comment>
- <glob pattern=\'*.hh\' weight=\'70\'/>
- <glob pattern=\'*.hxx\' weight=\'70\'/>
- <glob pattern=\'*.h++\' weight=\'70\'/>
- <glob pattern=\'*.hpp\' weight=\'70\'/>
- <glob pattern=\'*.hp\' weight=\'70\'/>
- <!-- Additions to freedesktop: -->
- <glob pattern=\'*.h\' weight=\'70\'/>
- <glob pattern=\'*.H\' weight=\'70\'/>
- <!-- Find include guards of header files without extension, for
- example, STL ones like <string>. Those can have a big initial
- comment exceeding 1000 chars, though. -->
- <magic priority=\'50\'>
- <match value=\'#ifndef \' type=\'string\' offset=\'0:2000\'/>
- <match value=\'#if \' type=\'string\' offset=\'0:2000\'/>
- <match value=\'#include \' type=\'string\' offset=\'0:2000\'/>
- </magic>
- </mime-type>
+ \" <!-- Those are used to find matching headers by the CppTools plugin,\",
+ \" so, they should match -->\",
+ \" <mime-type type=\'text/x-c++hdr\'>\",
+ \" <sub-class-of type=\'text/x-chdr\'/>\",
+ \" <comment>C++ header</comment>\",
+ \" <glob pattern=\'*.hh\' weight=\'70\'/>\",
+ \" <glob pattern=\'*.hxx\' weight=\'70\'/>\",
+ \" <glob pattern=\'*.h++\' weight=\'70\'/>\",
+ \" <glob pattern=\'*.hpp\' weight=\'70\'/>\",
+ \" <glob pattern=\'*.hp\' weight=\'70\'/>\",
+ \" <!-- Additions to freedesktop: -->\",
+ \" <glob pattern=\'*.h\' weight=\'70\'/>\",
+ \" <glob pattern=\'*.H\' weight=\'70\'/>\",
+ \" <!-- Find include guards of header files without extension, for\",
+ \" example, STL ones like <string>. Those can have a big initial\",
+ \" comment exceeding 1000 chars, though. -->\",
+ \" <magic priority=\'50\'>\",
+ \" <match value=\'#ifndef \' type=\'string\' offset=\'0:2000\'/>\",
+ \" <match value=\'#if \' type=\'string\' offset=\'0:2000\'/>\",
+ \" <match value=\'#include \' type=\'string\' offset=\'0:2000\'/>\",
+ \" </magic>\",
+ \" </mime-type>\",
- <mime-type type=\'text/x-c++src\'>
- <comment>C++ source code</comment>
- <sub-class-of type=\'text/x-csrc\'/>
- <glob pattern=\'*.cpp\' weight=\'70\'/>
- <glob pattern=\'*.cxx\' weight=\'70\'/>
- <glob pattern=\'*.cc\' weight=\'70\'/>
- <glob pattern=\'*.C\' case-sensitive=\'true\' weight=\'70\'/>
- <glob pattern=\'*.c++\' weight=\'70\'/>
- <!-- Additions to freedesktop: -->
- <glob pattern=\'*.cp\' weight=\'70\'/>
- <glob pattern=\'*.inl\' weight=\'70\'/>
- <glob pattern=\'*.tcc\' weight=\'70\'/>
- <glob pattern=\'*.tpp\' weight=\'70\'/>
- <glob pattern=\'*.t++\' weight=\'70\'/>
- <glob pattern=\'*.txx\' weight=\'70\'/>
- <magic priority=\'30\'>
- <match value=\'-*- C++ -*-\' type=\'string\' offset=\'0:30\'/>
- </magic>
- </mime-type>
+ \" <mime-type type=\'text/x-c++src\'>\",
+ \" <comment>C++ source code</comment>\",
+ \" <sub-class-of type=\'text/x-csrc\'/>\",
+ \" <glob pattern=\'*.cpp\' weight=\'70\'/>\",
+ \" <glob pattern=\'*.cxx\' weight=\'70\'/>\",
+ \" <glob pattern=\'*.cc\' weight=\'70\'/>\",
+ \" <glob pattern=\'*.C\' case-sensitive=\'true\' weight=\'70\'/>\",
+ \" <glob pattern=\'*.c++\' weight=\'70\'/>\",
+ \" <!-- Additions to freedesktop: -->\",
+ \" <glob pattern=\'*.cp\' weight=\'70\'/>\",
+ \" <glob pattern=\'*.inl\' weight=\'70\'/>\",
+ \" <glob pattern=\'*.tcc\' weight=\'70\'/>\",
+ \" <glob pattern=\'*.tpp\' weight=\'70\'/>\",
+ \" <glob pattern=\'*.t++\' weight=\'70\'/>\",
+ \" <glob pattern=\'*.txx\' weight=\'70\'/>\",
+ \" <magic priority=\'30\'>\",
+ \" <match value=\'-*- C++ -*-\' type=\'string\' offset=\'0:30\'/>\",
+ \" </magic>\",
+ \" </mime-type>\",
- <mime-type type=\'text/x-qdoc\'>
- <comment>Qt documentation file</comment>
- <sub-class-of type=\'text/plain\'/>
- <glob pattern=\'*.qdoc\' weight=\'70\'/>
- </mime-type>
+ \" <mime-type type=\'text/x-qdoc\'>\",
+ \" <comment>Qt documentation file</comment>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <glob pattern=\'*.qdoc\' weight=\'70\'/>\",
+ \" </mime-type>\",
- <mime-type type=\'text/x-moc\'>
- <comment>Qt MOC file</comment>
- <!-- Fix to freedesktop: moc is C++ source -->
- <sub-class-of type=\'text/x-c++src\'/>
- <glob pattern=\'*.moc\' weight=\'70\'/>
- </mime-type>
+ \" <mime-type type=\'text/x-moc\'>\",
+ \" <comment>Qt MOC file</comment>\",
+ \" <!-- Fix to freedesktop: moc is C++ source -->\",
+ \" <sub-class-of type=\'text/x-c++src\'/>\",
+ \" <glob pattern=\'*.moc\' weight=\'70\'/>\",
+ \" </mime-type>\",
- <mime-type type=\'text/x-objc++src\'>
- <comment>Objective-C++ source code</comment>
- <sub-class-of type=\'text/x-c++src\'/>
- <sub-class-of type=\'text/x-objcsrc\'/>
- <glob pattern=\'*.mm\' weight=\'70\'/>
- </mime-type>
+ \" <mime-type type=\'text/x-objc++src\'>\",
+ \" <comment>Objective-C++ source code</comment>\",
+ \" <sub-class-of type=\'text/x-c++src\'/>\",
+ \" <sub-class-of type=\'text/x-objcsrc\'/>\",
+ \" <glob pattern=\'*.mm\' weight=\'70\'/>\",
+ \" </mime-type>\",
- <mime-type type=\'text/x-objcsrc\'>
- <comment>Objective-C source code</comment>
- <sub-class-of type=\'text/x-csrc\'/>
- <glob pattern=\'*.m\' weight=\'70\'/>
- <magic priority=\'30\'>
- <match value=\'#import\' type=\'string\' offset=\'0\'/>
- </magic>
- </mime-type>
+ \" <mime-type type=\'text/x-objcsrc\'>\",
+ \" <comment>Objective-C source code</comment>\",
+ \" <sub-class-of type=\'text/x-csrc\'/>\",
+ \" <glob pattern=\'*.m\' weight=\'70\'/>\",
+ \" <magic priority=\'30\'>\",
+ \" <match value=\'#import\' type=\'string\' offset=\'0\'/>\",
+ \" </magic>\",
+ \" </mime-type>\",
- </mime-info>
- \"
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/cvs/CVS.json.in b/src/plugins/cvs/CVS.json.in
index d18e228f1d..1efdd73d48 100644
--- a/src/plugins/cvs/CVS.json.in
+++ b/src/plugins/cvs/CVS.json.in
@@ -17,13 +17,13 @@
\"Url\" : \"http://www.qt.io\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'text/vnd.qtcreator.cvs.submit\'>
- <comment>CVS submit template</comment>
- <sub-class-of type=\'text/plain\'/>
- </mime-type>
- </mime-info>
- \"
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'text/vnd.qtcreator.cvs.submit\'>\",
+ \" <comment>CVS submit template</comment>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/debugger/Debugger.json.in b/src/plugins/debugger/Debugger.json.in
index 458d1a8456..c4ed7f18e3 100644
--- a/src/plugins/debugger/Debugger.json.in
+++ b/src/plugins/debugger/Debugger.json.in
@@ -41,20 +41,20 @@
],
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'text/x-asm\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>Assembler</comment>
- <glob pattern=\'*.asm\'/>
- </mime-type>
- <!-- Catch-all for assemblers -->
- <mime-type type=\'text/x-qtcreator-generic-asm\'>
- <sub-class-of type=\'text/x-asm\'/>
- <comment>Qt Creator Generic Assembler</comment>
- <glob pattern=\'*.asm\'/>
- </mime-type>
- </mime-info>
- \"
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'text/x-asm\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>Assembler</comment>\",
+ \" <glob pattern=\'*.asm\'/>\",
+ \" </mime-type>\",
+ \" <!-- Catch-all for assemblers -->\",
+ \" <mime-type type=\'text/x-qtcreator-generic-asm\'>\",
+ \" <sub-class-of type=\'text/x-asm\'/>\",
+ \" <comment>Qt Creator Generic Assembler</comment>\",
+ \" <glob pattern=\'*.asm\'/>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/genericprojectmanager/GenericProjectManager.json.in b/src/plugins/genericprojectmanager/GenericProjectManager.json.in
index cc9ce119d4..306d2fcaa4 100644
--- a/src/plugins/genericprojectmanager/GenericProjectManager.json.in
+++ b/src/plugins/genericprojectmanager/GenericProjectManager.json.in
@@ -17,34 +17,34 @@
\"Url\" : \"http://www.qt.io\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'text/x-generic-project\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>Generic Qt Creator Project file</comment>
- <glob pattern=\'*.creator\'/>
- </mime-type>
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'text/x-generic-project\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>Generic Qt Creator Project file</comment>\",
+ \" <glob pattern=\'*.creator\'/>\",
+ \" </mime-type>\",
- <mime-type type=\'application/vnd.qtcreator.generic.files\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>Generic Project Files</comment>
- <glob pattern=\'*.files\'/>
- </mime-type>
+ \" <mime-type type=\'application/vnd.qtcreator.generic.files\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>Generic Project Files</comment>\",
+ \" <glob pattern=\'*.files\'/>\",
+ \" </mime-type>\",
- <mime-type type=\'application/vnd.qtcreator.generic.includes\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>Generic Project Include Paths</comment>
- <glob pattern=\'*.includes\'/>
- </mime-type>
+ \" <mime-type type=\'application/vnd.qtcreator.generic.includes\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>Generic Project Include Paths</comment>\",
+ \" <glob pattern=\'*.includes\'/>\",
+ \" </mime-type>\",
- <mime-type type=\'application/vnd.qtcreator.generic.config\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>Generic Project Configuration File</comment>
- <glob pattern=\'*.config\'/>
- </mime-type>
+ \" <mime-type type=\'application/vnd.qtcreator.generic.config\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>Generic Project Configuration File</comment>\",
+ \" <glob pattern=\'*.config\'/>\",
+ \" </mime-type>\",
- </mime-info>
- \"
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/git/Git.json.in b/src/plugins/git/Git.json.in
index c2680577ba..ebbee5d409 100644
--- a/src/plugins/git/Git.json.in
+++ b/src/plugins/git/Git.json.in
@@ -17,20 +17,20 @@
\"Url\" : \"http://www.qt.io\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'text/vnd.qtcreator.git.commit\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>Git Commit File</comment>
- <glob pattern=\'COMMIT_MSG\'/>
- <glob pattern=\'COMMIT_EDITMSG\'/>
- </mime-type>
- <mime-type type=\'text/vnd.qtcreator.git.rebase\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>Git Commit File</comment>
- <glob pattern=\'git-rebase-todo\'/>
- </mime-type>
- </mime-info>
- \"
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'text/vnd.qtcreator.git.commit\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>Git Commit File</comment>\",
+ \" <glob pattern=\'COMMIT_MSG\'/>\",
+ \" <glob pattern=\'COMMIT_EDITMSG\'/>\",
+ \" </mime-type>\",
+ \" <mime-type type=\'text/vnd.qtcreator.git.rebase\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>Git Commit File</comment>\",
+ \" <glob pattern=\'git-rebase-todo\'/>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/glsleditor/GLSLEditor.json.in b/src/plugins/glsleditor/GLSLEditor.json.in
index 915ae7ae02..09814901a2 100644
--- a/src/plugins/glsleditor/GLSLEditor.json.in
+++ b/src/plugins/glsleditor/GLSLEditor.json.in
@@ -17,48 +17,48 @@
\"Url\" : \"http://www.qt.io\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
- <mime-type type=\'application/x-glsl\'>
- <alias type=\'text/x-glsl\'/>
- <sub-class-of type=\'text/plain\'/>
- <comment>GLSL Shader file</comment>
- <glob pattern=\'*.glsl\'/>
- <glob pattern=\'*.shader\'/>
- </mime-type>
+ \" <mime-type type=\'application/x-glsl\'>\",
+ \" <alias type=\'text/x-glsl\'/>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>GLSL Shader file</comment>\",
+ \" <glob pattern=\'*.glsl\'/>\",
+ \" <glob pattern=\'*.shader\'/>\",
+ \" </mime-type>\",
- <mime-type type=\'text/x-glsl-frag\'>
- <sub-class-of type=\'text/x-glsl\'/>
- <comment>GLSL Fragment Shader file</comment>
- <glob pattern=\'*.frag\'/>
- </mime-type>
+ \" <mime-type type=\'text/x-glsl-frag\'>\",
+ \" <sub-class-of type=\'text/x-glsl\'/>\",
+ \" <comment>GLSL Fragment Shader file</comment>\",
+ \" <glob pattern=\'*.frag\'/>\",
+ \" </mime-type>\",
- <mime-type type=\'text/x-glsl-es-frag\'>
- <sub-class-of type=\'text/x-glsl\'/>
- <comment>GLSL/ES Fragment Shader file</comment>
- <glob pattern=\'*.fsh\'/>
- </mime-type>
+ \" <mime-type type=\'text/x-glsl-es-frag\'>\",
+ \" <sub-class-of type=\'text/x-glsl\'/>\",
+ \" <comment>GLSL/ES Fragment Shader file</comment>\",
+ \" <glob pattern=\'*.fsh\'/>\",
+ \" </mime-type>\",
- <mime-type type=\'text/x-glsl-vert\'>
- <sub-class-of type=\'text/x-glsl\'/>
- <comment>GLSL Vertex Shader file</comment>
- <glob pattern=\'*.vert\'/>
- </mime-type>
+ \" <mime-type type=\'text/x-glsl-vert\'>\",
+ \" <sub-class-of type=\'text/x-glsl\'/>\",
+ \" <comment>GLSL Vertex Shader file</comment>\",
+ \" <glob pattern=\'*.vert\'/>\",
+ \" </mime-type>\",
- <mime-type type=\'text/x-glsl-es-vert\'>
- <sub-class-of type=\'text/x-glsl\'/>
- <comment>GLSL/ES Vertex Shader file</comment>
- <glob pattern=\'*.vsh\'/>
- </mime-type>
+ \" <mime-type type=\'text/x-glsl-es-vert\'>\",
+ \" <sub-class-of type=\'text/x-glsl\'/>\",
+ \" <comment>GLSL/ES Vertex Shader file</comment>\",
+ \" <glob pattern=\'*.vsh\'/>\",
+ \" </mime-type>\",
- <mime-type type=\'text/x-glsl-es-geometry\'>
- <sub-class-of type=\'text/x-glsl\'/>
- <comment>GLSL/ES Geometry Shader file</comment>
- <glob pattern=\'*.gsh\'/>
- </mime-type>
+ \" <mime-type type=\'text/x-glsl-es-geometry\'>\",
+ \" <sub-class-of type=\'text/x-glsl\'/>\",
+ \" <comment>GLSL/ES Geometry Shader file</comment>\",
+ \" <glob pattern=\'*.gsh\'/>\",
+ \" </mime-type>\",
- </mime-info>
- \"
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/imageviewer/ImageViewer.json.in b/src/plugins/imageviewer/ImageViewer.json.in
index 685dff9a9f..59fa5f7282 100644
--- a/src/plugins/imageviewer/ImageViewer.json.in
+++ b/src/plugins/imageviewer/ImageViewer.json.in
@@ -17,15 +17,15 @@
\"Url\" : \"http://www.qt.io\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
- <mime-type type=\'image/webp\'>
- <comment>WebP Image file</comment>
- <glob pattern=\'*.webp\'/>
- </mime-type>
+ \" <mime-type type=\'image/webp\'>\",
+ \" <comment>WebP Image file</comment>\",
+ \" <glob pattern=\'*.webp\'/>\",
+ \" </mime-type>\",
- </mime-info>
- \"
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/modeleditor/ModelEditor.json.in b/src/plugins/modeleditor/ModelEditor.json.in
index 44558589be..8fc6c019cb 100644
--- a/src/plugins/modeleditor/ModelEditor.json.in
+++ b/src/plugins/modeleditor/ModelEditor.json.in
@@ -18,14 +18,14 @@
\"Experimental\" : true,
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\' encoding=\'UTF-8\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'text/vnd.qtcreator.model\'>
- <sub-class-of type=\'text/xml\'/>
- <comment>Qt Creator Model File</comment>
- <glob pattern=\'*.qmodel\'/>
- </mime-type>
- </mime-info>
- \"
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\' encoding=\'UTF-8\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'text/vnd.qtcreator.model\'>\",
+ \" <sub-class-of type=\'text/xml\'/>\",
+ \" <comment>Qt Creator Model File</comment>\",
+ \" <glob pattern=\'*.qmodel\'/>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/nim/Nim.json.in b/src/plugins/nim/Nim.json.in
index 3fc6a65135..9f44b2ce45 100644
--- a/src/plugins/nim/Nim.json.in
+++ b/src/plugins/nim/Nim.json.in
@@ -18,27 +18,27 @@
\"Experimental\" : true,
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
- <mime-type type=\'text/x-nim-project\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>Nim project file</comment>
- <glob pattern=\'*.nimproject\'/>
- </mime-type>
+ \" <mime-type type=\'text/x-nim-project\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>Nim project file</comment>\",
+ \" <glob pattern=\'*.nimproject\'/>\",
+ \" </mime-type>\",
- <mime-type type=\'text/x-nim\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>Nim source file </comment>
- <glob pattern=\'*.nim\'/>
- </mime-type>
+ \" <mime-type type=\'text/x-nim\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>Nim source file </comment>\",
+ \" <glob pattern=\'*.nim\'/>\",
+ \" </mime-type>\",
- <mime-type type=\'text/x-nim-script\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>Nim script file </comment>
- <glob pattern=\'*.nims\'/>
- </mime-type>
- </mime-info>
- \"
+ \" <mime-type type=\'text/x-nim-script\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>Nim script file </comment>\",
+ \" <glob pattern=\'*.nims\'/>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/perforce/Perforce.json.in b/src/plugins/perforce/Perforce.json.in
index 7d408c00e4..cb92d2542d 100644
--- a/src/plugins/perforce/Perforce.json.in
+++ b/src/plugins/perforce/Perforce.json.in
@@ -17,16 +17,16 @@
\"Url\" : \"http://www.qt.io\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'text/vnd.qtcreator.p4.submit\'>
- <comment>Perforce submit template</comment>
- <sub-class-of type=\'text/plain\'/>
- <magic priority=\'50\'>
- <match value=\'# A Perforce Change Specification.\' type=\'string\' offset=\'0\'/>
- </magic>
- </mime-type>
- </mime-info>
- \"
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'text/vnd.qtcreator.p4.submit\'>\",
+ \" <comment>Perforce submit template</comment>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <magic priority=\'50\'>\",
+ \" <match value=\'# A Perforce Change Specification.\' type=\'string\' offset=\'0\'/>\",
+ \" </magic>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/pythoneditor/PythonEditor.json.in b/src/plugins/pythoneditor/PythonEditor.json.in
index 5f3709887d..5416dbfa63 100644
--- a/src/plugins/pythoneditor/PythonEditor.json.in
+++ b/src/plugins/pythoneditor/PythonEditor.json.in
@@ -17,19 +17,19 @@
\"Url\" : \"http://www.qt.io\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'text/x-python-gui\'>
- <sub-class-of type=\'text/x-python\'/>
- <comment>Python source file without console</comment>
- <glob pattern=\'*.pyw\'/>
- </mime-type>
- <mime-type type=\'text/x-python-project\'>
- <sub-class-of type=\'text/x-python\'/>
- <comment>Qt Creator Python project file</comment>
- <glob pattern=\'*.pyqtc\'/>
- </mime-type>
- </mime-info>
- \"
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'text/x-python-gui\'>\",
+ \" <sub-class-of type=\'text/x-python\'/>\",
+ \" <comment>Python source file without console</comment>\",
+ \" <glob pattern=\'*.pyw\'/>\",
+ \" </mime-type>\",
+ \" <mime-type type=\'text/x-python-project\'>\",
+ \" <sub-class-of type=\'text/x-python\'/>\",
+ \" <comment>Qt Creator Python project file</comment>\",
+ \" <glob pattern=\'*.pyqtc\'/>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/qmakeprojectmanager/QmakeProjectManager.json.in b/src/plugins/qmakeprojectmanager/QmakeProjectManager.json.in
index ae3d11d8c0..6f4826ed55 100644
--- a/src/plugins/qmakeprojectmanager/QmakeProjectManager.json.in
+++ b/src/plugins/qmakeprojectmanager/QmakeProjectManager.json.in
@@ -17,39 +17,39 @@
\"Url\" : \"http://www.qt.io\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'application/vnd.qt.qmakeprofile\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>Qt Project file</comment>
- <glob pattern=\'*.pro\'/>
- </mime-type>
- <mime-type type=\'application/vnd.qt.qmakeproincludefile\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>Qt Project include file</comment>
- <glob pattern=\'*.pri\'/>
- </mime-type>
- <mime-type type=\'application/vnd.qt.qmakeprofeaturefile\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>Qt Project feature file</comment>
- <glob pattern=\'*.prf\'/>
- </mime-type>
- <mime-type type=\'application/vnd.qt.qmakeproconfigurationfile\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>Qt Project configuration file</comment>
- <glob pattern=\'.qmake.conf\'/>
- </mime-type>
- <mime-type type=\'application/vnd.qt.qmakeprocachefile\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>Qt Project cache file</comment>
- <glob pattern=\'.qmake.cache\'/>
- </mime-type>
- <mime-type type=\'application/vnd.qt.qmakeprostashfile\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>Qt Project stash file</comment>
- <glob pattern=\'.qmake.stash\'/>
- </mime-type>
- </mime-info>
- \"
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'application/vnd.qt.qmakeprofile\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>Qt Project file</comment>\",
+ \" <glob pattern=\'*.pro\'/>\",
+ \" </mime-type>\",
+ \" <mime-type type=\'application/vnd.qt.qmakeproincludefile\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>Qt Project include file</comment>\",
+ \" <glob pattern=\'*.pri\'/>\",
+ \" </mime-type>\",
+ \" <mime-type type=\'application/vnd.qt.qmakeprofeaturefile\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>Qt Project feature file</comment>\",
+ \" <glob pattern=\'*.prf\'/>\",
+ \" </mime-type>\",
+ \" <mime-type type=\'application/vnd.qt.qmakeproconfigurationfile\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>Qt Project configuration file</comment>\",
+ \" <glob pattern=\'.qmake.conf\'/>\",
+ \" </mime-type>\",
+ \" <mime-type type=\'application/vnd.qt.qmakeprocachefile\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>Qt Project cache file</comment>\",
+ \" <glob pattern=\'.qmake.cache\'/>\",
+ \" </mime-type>\",
+ \" <mime-type type=\'application/vnd.qt.qmakeprostashfile\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>Qt Project stash file</comment>\",
+ \" <glob pattern=\'.qmake.stash\'/>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/qmljstools/QmlJSTools.json.in b/src/plugins/qmljstools/QmlJSTools.json.in
index 1d50eae3c4..1861e87513 100644
--- a/src/plugins/qmljstools/QmlJSTools.json.in
+++ b/src/plugins/qmljstools/QmlJSTools.json.in
@@ -18,45 +18,45 @@
\"Url\" : \"http://www.qt.io\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'text/x-qml\'>
- <alias type=\'application/x-qml\'/>
- <!-- sub class is missing in the freedesktop.org definition -->
- <sub-class-of type=\'text/plain\'/>
- <comment>QML file</comment>
- <glob pattern=\'*.qml\' weight=\'70\'/>
- </mime-type>
- <mime-type type=\'application/x-qt.qbs+qml\'>
- <alias type=\'text/x-qt.qbs+qml\'/>
- <sub-class-of type=\'text/x-qml\'/>
- <comment>Qt Build Suite file</comment>
- <glob pattern=\'*.qbs\' weight=\'70\'/>
- </mime-type>
- <mime-type type=\'application/x-qt.ui+qml\'>
- <alias type=\'text/x-qt.ui+qml\'/>
- <sub-class-of type=\'text/x-qml\'/>
- <comment>QtQuick Designer ui file</comment>
- <glob pattern=\'*.ui.qml\' weight=\'70\'/>
- </mime-type>
- <mime-type type=\'application/x-qmlproject\'>
- <alias type=\'text/x-qmlproject\'/>
- <sub-class-of type=\'text/x-qml\'/>
- <comment>Qt Creator Qt UI project file</comment>
- <glob pattern=\'*.qmlproject\' weight=\'70\'/>
- </mime-type>
- <mime-type type=\'application/x-qt.meta-info+qml\'>
- <alias type=\'text/x-qt.meta-info+qml\'/>
- <sub-class-of type=\'text/x-qml\'/>
- <comment>QML file</comment>
- <glob pattern=\'*.qmltypes\' weight=\'70\'/>
- </mime-type>
- <mime-type type=\'application/json\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>JSON file</comment>
- <glob pattern=\'*.json\' weight=\'70\'/>
- </mime-type>
- </mime-info>
- \"
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'text/x-qml\'>\",
+ \" <alias type=\'application/x-qml\'/>\",
+ \" <!-- sub class is missing in the freedesktop.org definition -->\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>QML file</comment>\",
+ \" <glob pattern=\'*.qml\' weight=\'70\'/>\",
+ \" </mime-type>\",
+ \" <mime-type type=\'application/x-qt.qbs+qml\'>\",
+ \" <alias type=\'text/x-qt.qbs+qml\'/>\",
+ \" <sub-class-of type=\'text/x-qml\'/>\",
+ \" <comment>Qt Build Suite file</comment>\",
+ \" <glob pattern=\'*.qbs\' weight=\'70\'/>\",
+ \" </mime-type>\",
+ \" <mime-type type=\'application/x-qt.ui+qml\'>\",
+ \" <alias type=\'text/x-qt.ui+qml\'/>\",
+ \" <sub-class-of type=\'text/x-qml\'/>\",
+ \" <comment>QtQuick Designer ui file</comment>\",
+ \" <glob pattern=\'*.ui.qml\' weight=\'70\'/>\",
+ \" </mime-type>\",
+ \" <mime-type type=\'application/x-qmlproject\'>\",
+ \" <alias type=\'text/x-qmlproject\'/>\",
+ \" <sub-class-of type=\'text/x-qml\'/>\",
+ \" <comment>Qt Creator Qt UI project file</comment>\",
+ \" <glob pattern=\'*.qmlproject\' weight=\'70\'/>\",
+ \" </mime-type>\",
+ \" <mime-type type=\'application/x-qt.meta-info+qml\'>\",
+ \" <alias type=\'text/x-qt.meta-info+qml\'/>\",
+ \" <sub-class-of type=\'text/x-qml\'/>\",
+ \" <comment>QML file</comment>\",
+ \" <glob pattern=\'*.qmltypes\' weight=\'70\'/>\",
+ \" </mime-type>\",
+ \" <mime-type type=\'application/json\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>JSON file</comment>\",
+ \" <glob pattern=\'*.json\' weight=\'70\'/>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/qmlprojectmanager/QmlProjectManager.json.in b/src/plugins/qmlprojectmanager/QmlProjectManager.json.in
index fcd607a228..329e4b603d 100644
--- a/src/plugins/qmlprojectmanager/QmlProjectManager.json.in
+++ b/src/plugins/qmlprojectmanager/QmlProjectManager.json.in
@@ -17,15 +17,15 @@
\"Url\" : \"http://www.qt.io\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'application/x-qmlproject\'>
- <sub-class-of type=\'text/x-qml\'/>
- <comment>QML Project file</comment>
- <glob pattern=\'*.qmlproject\'/>
- </mime-type>
- </mime-info>
- \"
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'application/x-qmlproject\'>\",
+ \" <sub-class-of type=\'text/x-qml\'/>\",
+ \" <comment>QML Project file</comment>\",
+ \" <glob pattern=\'*.qmlproject\'/>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/qtsupport/QtSupport.json.in b/src/plugins/qtsupport/QtSupport.json.in
index b62bb1b29d..1447c9c14b 100644
--- a/src/plugins/qtsupport/QtSupport.json.in
+++ b/src/plugins/qtsupport/QtSupport.json.in
@@ -18,25 +18,25 @@
\"Url\" : \"http://www.qt.io\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'application/x-linguist-translation\'>
- <comment>Linguist compiled translations</comment>
- <glob pattern=\'*.qm\'/>
- </mime-type>
- <mime-type type=\'application/x-linguist\'>
- <comment>Linguist source translations</comment>
- <magic>
- <match value=\'&lt;TS\' type=\'string\' offset=\'0:256\'/>
- </magic>
- <glob pattern=\'*.ts\' weight=\'70\'/>
- </mime-type>
- <mime-type type=\'application/scxml+xml\'>
- <comment>SCXML State Chart</comment>
- <sub-class-of type=\'application/xml\'/>
- <glob pattern=\'*.scxml\'/>
- </mime-type>
- </mime-info>
- \"
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'application/x-linguist-translation\'>\",
+ \" <comment>Linguist compiled translations</comment>\",
+ \" <glob pattern=\'*.qm\'/>\",
+ \" </mime-type>\",
+ \" <mime-type type=\'application/x-linguist\'>\",
+ \" <comment>Linguist source translations</comment>\",
+ \" <magic>\",
+ \" <match value=\'&lt;TS\' type=\'string\' offset=\'0:256\'/>\",
+ \" </magic>\",
+ \" <glob pattern=\'*.ts\' weight=\'70\'/>\",
+ \" </mime-type>\",
+ \" <mime-type type=\'application/scxml+xml\'>\",
+ \" <comment>SCXML State Chart</comment>\",
+ \" <sub-class-of type=\'application/xml\'/>\",
+ \" <glob pattern=\'*.scxml\'/>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/resourceeditor/ResourceEditor.json.in b/src/plugins/resourceeditor/ResourceEditor.json.in
index 6bf2776a0c..dc0a5c8822 100644
--- a/src/plugins/resourceeditor/ResourceEditor.json.in
+++ b/src/plugins/resourceeditor/ResourceEditor.json.in
@@ -17,14 +17,14 @@
\"Url\" : \"http://www.qt.io\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'application/vnd.qt.xml.resource\'>
- <sub-class-of type=\'text/xml\'/>
- <comment>Qt Resource file</comment>
- <glob pattern=\'*.qrc\'/>
- </mime-type>
- </mime-info>
- \"
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'application/vnd.qt.xml.resource\'>\",
+ \" <sub-class-of type=\'text/xml\'/>\",
+ \" <comment>Qt Resource file</comment>\",
+ \" <glob pattern=\'*.qrc\'/>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/scxmleditor/ScxmlEditor.json.in b/src/plugins/scxmleditor/ScxmlEditor.json.in
index 1e48677f5f..1218f4129b 100644
--- a/src/plugins/scxmleditor/ScxmlEditor.json.in
+++ b/src/plugins/scxmleditor/ScxmlEditor.json.in
@@ -18,14 +18,14 @@
\"Experimental\" : true,
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'application/scxml+xml\'>
- <sub-class-of type=\'text/xml\'/>
- <comment>SCXML file</comment>
- <glob pattern=\'*.scxml\'/>
- </mime-type>
- </mime-info>
- \"
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'application/scxml+xml\'>\",
+ \" <sub-class-of type=\'text/xml\'/>\",
+ \" <comment>SCXML file</comment>\",
+ \" <glob pattern=\'*.scxml\'/>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/subversion/Subversion.json.in b/src/plugins/subversion/Subversion.json.in
index a31c9dd38b..8196061d64 100644
--- a/src/plugins/subversion/Subversion.json.in
+++ b/src/plugins/subversion/Subversion.json.in
@@ -17,13 +17,13 @@
\"Url\" : \"http://www.qt.io\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'text/vnd.qtcreator.svn.submit\'>
- <comment>Subversion submit template</comment>
- <sub-class-of type=\'text/plain\'/>
- </mime-type>
- </mime-info>
- \"
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'text/vnd.qtcreator.svn.submit\'>\",
+ \" <comment>Subversion submit template</comment>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}
diff --git a/src/plugins/tasklist/TaskList.json.in b/src/plugins/tasklist/TaskList.json.in
index 202bf41b2a..7c1f6f4ee2 100644
--- a/src/plugins/tasklist/TaskList.json.in
+++ b/src/plugins/tasklist/TaskList.json.in
@@ -16,15 +16,15 @@
\"Url\" : \"http://www.qt.io\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\' encoding=\'UTF-8\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'text/x-tasklist\'>
- <sub-class-of type=\'text/plain\'/>
- <comment>Qt Creator task list file</comment>
- <glob pattern=\'*.tasks\'/>
- <glob pattern=\'*.tasks.txt\'/>
- </mime-type>
- </mime-info>
- \"
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\' encoding=\'UTF-8\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'text/x-tasklist\'>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" <comment>Qt Creator task list file</comment>\",
+ \" <glob pattern=\'*.tasks\'/>\",
+ \" <glob pattern=\'*.tasks.txt\'/>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}