Commit 029fd5a5 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

Streamline mimetypes.xml files

Change-Id: I4f2a28d4732ea496f574e5f51fb1e1633ebca99d
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent 67c3fed2
...@@ -44,6 +44,11 @@ Product { ...@@ -44,6 +44,11 @@ Product {
fileTags: ["pluginSpecIn"] fileTags: ["pluginSpecIn"]
} }
Group {
name: "MimeTypes"
files: [ "*.mimetypes.xml" ]
}
Group { Group {
fileTagsFilter: product.type fileTagsFilter: product.type
qbs.install: true qbs.install: true
......
<RCC> <RCC>
<qresource prefix="/autotoolsproject" > <qresource prefix="/autotoolsproject" >
<file>AutotoolsProject.mimetypes.xml</file> <file>AutotoolsProjectManager.mimetypes.xml</file>
</qresource> </qresource>
</RCC> </RCC>
...@@ -32,5 +32,3 @@ SOURCES = autotoolsprojectplugin.cpp\ ...@@ -32,5 +32,3 @@ SOURCES = autotoolsprojectplugin.cpp\
makefileparserthread.cpp\ makefileparserthread.cpp\
makefileparser.cpp makefileparser.cpp
RESOURCES += autotoolsproject.qrc RESOURCES += autotoolsproject.qrc
OTHER_FILES += AutotoolsProject.mimetypes.xml
...@@ -12,7 +12,6 @@ QtcPlugin { ...@@ -12,7 +12,6 @@ QtcPlugin {
Depends { name: "CppTools" } Depends { name: "CppTools" }
files: [ files: [
"AutotoolsProject.mimetypes.xml",
"autogenstep.cpp", "autogenstep.cpp",
"autogenstep.h", "autogenstep.h",
"autoreconfstep.cpp", "autoreconfstep.cpp",
......
...@@ -59,7 +59,7 @@ bool AutotoolsProjectPlugin::initialize(const QStringList &arguments, ...@@ -59,7 +59,7 @@ bool AutotoolsProjectPlugin::initialize(const QStringList &arguments,
{ {
Q_UNUSED(arguments); Q_UNUSED(arguments);
if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(":autotoolsproject/AutotoolsProject.mimetypes.xml"), errorString)) if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(":autotoolsproject/AutotoolsProjectManager.mimetypes.xml"), errorString))
return false; return false;
addAutoReleasedObject(new AutotoolsBuildConfigurationFactory); addAutoReleasedObject(new AutotoolsBuildConfigurationFactory);
......
...@@ -35,5 +35,3 @@ FORMS += checkoutdialog.ui \ ...@@ -35,5 +35,3 @@ FORMS += checkoutdialog.ui \
versionselector.ui versionselector.ui
RESOURCES += clearcase.qrc RESOURCES += clearcase.qrc
OTHER_FILES += ClearCase.mimetypes.xml
...@@ -17,7 +17,6 @@ QtcPlugin { ...@@ -17,7 +17,6 @@ QtcPlugin {
Depends { name: "Locator" } Depends { name: "Locator" }
files: [ files: [
"ClearCase.mimetypes.xml",
"activityselector.cpp", "activityselector.cpp",
"activityselector.h", "activityselector.h",
"annotationhighlighter.cpp", "annotationhighlighter.cpp",
......
<RCC> <RCC>
<qresource prefix="/cmakeproject"> <qresource prefix="/cmakeproject">
<file>CMakeProject.mimetypes.xml</file> <file>CMakeProjectManager.mimetypes.xml</file>
</qresource> </qresource>
</RCC> </RCC>
...@@ -34,7 +34,3 @@ SOURCES = cmakeproject.cpp \ ...@@ -34,7 +34,3 @@ SOURCES = cmakeproject.cpp \
cmakevalidator.cpp cmakevalidator.cpp
RESOURCES += cmakeproject.qrc RESOURCES += cmakeproject.qrc
FORMS +=
OTHER_FILES += CMakeProject.mimetypes.xml
...@@ -19,7 +19,7 @@ QtcPlugin { ...@@ -19,7 +19,7 @@ QtcPlugin {
] ]
files: [ files: [
"CMakeProject.mimetypes.xml", "CMakeProjectManager.mimetypes.xml",
"cmakebuildconfiguration.cpp", "cmakebuildconfiguration.cpp",
"cmakebuildconfiguration.h", "cmakebuildconfiguration.h",
"cmakeeditor.cpp", "cmakeeditor.cpp",
......
...@@ -57,7 +57,7 @@ CMakeProjectPlugin::~CMakeProjectPlugin() ...@@ -57,7 +57,7 @@ CMakeProjectPlugin::~CMakeProjectPlugin()
bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage) bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage)
{ {
if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(":cmakeproject/CMakeProject.mimetypes.xml"), errorMessage)) if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(":cmakeproject/CMakeProjectManager.mimetypes.xml"), errorMessage))
return false; return false;
CMakeSettingsPage *cmp = new CMakeSettingsPage(); CMakeSettingsPage *cmp = new CMakeSettingsPage();
addAutoReleasedObject(cmp); addAutoReleasedObject(cmp);
......
...@@ -36,7 +36,6 @@ SOURCES += cppeditorplugin.cpp \ ...@@ -36,7 +36,6 @@ SOURCES += cppeditorplugin.cpp \
cpptypehierarchy.cpp cpptypehierarchy.cpp
RESOURCES += cppeditor.qrc RESOURCES += cppeditor.qrc
OTHER_FILES += CppEditor.mimetypes.xml
equals(TEST, 1) { equals(TEST, 1) {
SOURCES += \ SOURCES += \
......
...@@ -17,7 +17,6 @@ QtcPlugin { ...@@ -17,7 +17,6 @@ QtcPlugin {
cpp.includePaths: base.concat("../../libs/3rdparty") cpp.includePaths: base.concat("../../libs/3rdparty")
files: [ files: [
"CppEditor.mimetypes.xml",
"cppautocompleter.cpp", "cppautocompleter.cpp",
"cppautocompleter.h", "cppautocompleter.h",
"cppclasswizard.cpp", "cppclasswizard.cpp",
......
...@@ -26,5 +26,3 @@ SOURCES += annotationhighlighter.cpp \ ...@@ -26,5 +26,3 @@ SOURCES += annotationhighlighter.cpp \
FORMS += settingspage.ui FORMS += settingspage.ui
RESOURCES += cvs.qrc RESOURCES += cvs.qrc
OTHER_FILES += CVS.mimetypes.xml
...@@ -13,7 +13,6 @@ QtcPlugin { ...@@ -13,7 +13,6 @@ QtcPlugin {
Depends { name: "Locator" } Depends { name: "Locator" }
files: [ files: [
"CVS.mimetypes.xml",
"annotationhighlighter.cpp", "annotationhighlighter.cpp",
"annotationhighlighter.h", "annotationhighlighter.h",
"checkoutwizard.cpp", "checkoutwizard.cpp",
......
...@@ -64,4 +64,4 @@ SOURCES += formeditorplugin.cpp \ ...@@ -64,4 +64,4 @@ SOURCES += formeditorplugin.cpp \
RESOURCES += designer.qrc RESOURCES += designer.qrc
OTHER_FILES += Designer.mimetypes.xml README.txt OTHER_FILES += README.txt
...@@ -20,7 +20,6 @@ QtcPlugin { ...@@ -20,7 +20,6 @@ QtcPlugin {
]) ])
files: [ files: [
"Designer.mimetypes.xml",
"README.txt", "README.txt",
"codemodelhelpers.cpp", "codemodelhelpers.cpp",
"codemodelhelpers.h", "codemodelhelpers.h",
......
<RCC> <RCC>
<qresource prefix="/genericproject" > <qresource prefix="/genericproject" >
<file>GenericProject.mimetypes.xml</file> <file>GenericProjectManager.mimetypes.xml</file>
</qresource> </qresource>
</RCC> </RCC>
...@@ -25,5 +25,3 @@ SOURCES = genericproject.cpp \ ...@@ -25,5 +25,3 @@ SOURCES = genericproject.cpp \
filesselectionwizardpage.cpp filesselectionwizardpage.cpp
RESOURCES += genericproject.qrc RESOURCES += genericproject.qrc
FORMS += genericmakestep.ui FORMS += genericmakestep.ui
OTHER_FILES += GenericProject.mimetypes.xml
...@@ -16,7 +16,6 @@ QtcPlugin { ...@@ -16,7 +16,6 @@ QtcPlugin {
Depends { name: "QtSupport" } Depends { name: "QtSupport" }
files: [ files: [
"GenericProject.mimetypes.xml",
"filesselectionwizardpage.cpp", "filesselectionwizardpage.cpp",
"filesselectionwizardpage.h", "filesselectionwizardpage.h",
"genericbuildconfiguration.cpp", "genericbuildconfiguration.cpp",
......
...@@ -71,7 +71,7 @@ bool GenericProjectPlugin::initialize(const QStringList &, QString *errorMessage ...@@ -71,7 +71,7 @@ bool GenericProjectPlugin::initialize(const QStringList &, QString *errorMessage
Core::MimeDatabase *mimeDB = ICore::mimeDatabase(); Core::MimeDatabase *mimeDB = ICore::mimeDatabase();
const QLatin1String mimetypesXml(":genericproject/GenericProject.mimetypes.xml"); const QLatin1String mimetypesXml(":genericproject/GenericProjectManager.mimetypes.xml");
if (! mimeDB->addMimeTypes(mimetypesXml, errorMessage)) if (! mimeDB->addMimeTypes(mimetypesXml, errorMessage))
return false; return false;
......
...@@ -64,6 +64,4 @@ include(gitorious/gitorious.pri) ...@@ -64,6 +64,4 @@ include(gitorious/gitorious.pri)
RESOURCES += \ RESOURCES += \
git.qrc git.qrc
OTHER_FILES += Git.mimetypes.xml
include(gerrit/gerrit.pri) include(gerrit/gerrit.pri)
...@@ -14,7 +14,6 @@ QtcPlugin { ...@@ -14,7 +14,6 @@ QtcPlugin {
Depends { name: "Locator" } Depends { name: "Locator" }
files: [ files: [
"Git.mimetypes.xml",
"annotationhighlighter.cpp", "annotationhighlighter.cpp",
"annotationhighlighter.h", "annotationhighlighter.h",
"branchadddialog.cpp", "branchadddialog.cpp",
......
...@@ -31,5 +31,4 @@ glslhoverhandler.cpp \ ...@@ -31,5 +31,4 @@ glslhoverhandler.cpp \
glslcompletionassist.cpp \ glslcompletionassist.cpp \
reuse.cpp reuse.cpp
OTHER_FILES += GLSLEditor.mimetypes.xml
RESOURCES += glsleditor.qrc RESOURCES += glsleditor.qrc
...@@ -14,7 +14,6 @@ QtcPlugin { ...@@ -14,7 +14,6 @@ QtcPlugin {
Depends { name: "CPlusPlus" } Depends { name: "CPlusPlus" }
files: [ files: [
"GLSLEditor.mimetypes.xml",
"glslautocompleter.cpp", "glslautocompleter.cpp",
"glslautocompleter.h", "glslautocompleter.h",
"glslcompletionassist.cpp", "glslcompletionassist.cpp",
......
...@@ -20,9 +20,6 @@ SOURCES += \ ...@@ -20,9 +20,6 @@ SOURCES += \
RESOURCES += \ RESOURCES += \
imageviewer.qrc imageviewer.qrc
OTHER_FILES += \
ImageViewer.mimetypes.xml
greaterThan(QT_MAJOR_VERSION, 4) { greaterThan(QT_MAJOR_VERSION, 4) {
!isEmpty(QT.svg.name): QT += svg !isEmpty(QT.svg.name): QT += svg
else: DEFINES += QT_NO_SVG else: DEFINES += QT_NO_SVG
......
...@@ -9,7 +9,6 @@ QtcPlugin { ...@@ -9,7 +9,6 @@ QtcPlugin {
Depends { name: "Core" } Depends { name: "Core" }
files: [ files: [
"ImageViewer.mimetypes.xml",
"imageview.cpp", "imageview.cpp",
"imageview.h", "imageview.h",
"imageviewer.cpp", "imageviewer.cpp",
......
...@@ -32,5 +32,3 @@ FORMS += settingspage.ui \ ...@@ -32,5 +32,3 @@ FORMS += settingspage.ui \
submitpanel.ui submitpanel.ui
RESOURCES += perforce.qrc RESOURCES += perforce.qrc
OTHER_FILES += Perforce.mimetypes.xml
...@@ -13,7 +13,6 @@ QtcPlugin { ...@@ -13,7 +13,6 @@ QtcPlugin {
Depends { name: "Locator" } Depends { name: "Locator" }
files: [ files: [
"Perforce.mimetypes.xml",
"annotationhighlighter.cpp", "annotationhighlighter.cpp",
"annotationhighlighter.h", "annotationhighlighter.h",
"changenumberdialog.cpp", "changenumberdialog.cpp",
......
...@@ -3,9 +3,6 @@ include(../../qtcreatorplugin.pri) ...@@ -3,9 +3,6 @@ include(../../qtcreatorplugin.pri)
DEFINES += \ DEFINES += \
PYTHONEDITOR_LIBRARY PYTHONEDITOR_LIBRARY
OTHER_FILES += \
pythoneditor.mimetypes.xml
RESOURCES += \ RESOURCES += \
pythoneditorplugin.qrc pythoneditorplugin.qrc
......
...@@ -15,7 +15,6 @@ QtcPlugin { ...@@ -15,7 +15,6 @@ QtcPlugin {
files: [ files: [
"pythoneditor.cpp", "pythoneditor.cpp",
"pythoneditor.h", "pythoneditor.h",
"pythoneditor.mimetypes.xml",
"pythoneditor_global.h", "pythoneditor_global.h",
"pythoneditorconstants.h", "pythoneditorconstants.h",
"pythoneditorfactory.cpp", "pythoneditorfactory.cpp",
......
...@@ -72,7 +72,7 @@ const char EN_PY_CPPMODULE_DESCRIPTION[] = ...@@ -72,7 +72,7 @@ const char EN_PY_CPPMODULE_DESCRIPTION[] =
* MIME type * MIME type
******************************************************************************/ ******************************************************************************/
const char C_PY_MIMETYPE[] = "text/x-python"; const char C_PY_MIMETYPE[] = "text/x-python";
const char RC_PY_MIME_XML[] = ":/pythoneditor/pythoneditor.mimetypes.xml"; const char RC_PY_MIME_XML[] = ":/pythoneditor/PythonEditor.mimetypes.xml";
const char C_PY_MIME_ICON[] = "text-x-python"; const char C_PY_MIME_ICON[] = "text-x-python";
} // namespace Constants } // namespace Constants
......
<RCC> <RCC>
<qresource prefix="/pythoneditor"> <qresource prefix="/pythoneditor">
<file>pythoneditor.mimetypes.xml</file> <file>PythonEditor.mimetypes.xml</file>
</qresource> </qresource>
</RCC> </RCC>
<RCC> <RCC>
<qresource prefix="/qmlproject"> <qresource prefix="/qmlproject">
<file>QmlProject.mimetypes.xml</file> <file>QmlProjectManager.mimetypes.xml</file>
<file>images/qmlfolder.png</file> <file>images/qmlfolder.png</file>
<file>images/qmlproject.png</file> <file>images/qmlproject.png</file>
<file>images/qml_wizard.png</file> <file>images/qml_wizard.png</file>
......
...@@ -34,5 +34,3 @@ SOURCES += qmlproject.cpp \ ...@@ -34,5 +34,3 @@ SOURCES += qmlproject.cpp \
qmlapplicationwizard.cpp qmlapplicationwizard.cpp
RESOURCES += qmlproject.qrc RESOURCES += qmlproject.qrc
OTHER_FILES += QmlProject.mimetypes.xml
...@@ -21,7 +21,6 @@ QtcPlugin { ...@@ -21,7 +21,6 @@ QtcPlugin {
"qmlapp.h", "qmlapp.h",
"qmlapplicationwizard.cpp", "qmlapplicationwizard.cpp",
"qmlapplicationwizard.h", "qmlapplicationwizard.h",
"QmlProject.mimetypes.xml",
"qmlproject.cpp", "qmlproject.cpp",
"qmlproject.h", "qmlproject.h",
"qmlproject.qrc", "qmlproject.qrc",
......
...@@ -62,7 +62,7 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage) ...@@ -62,7 +62,7 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
Core::MimeDatabase *mimeDB = Core::ICore::mimeDatabase(); Core::MimeDatabase *mimeDB = Core::ICore::mimeDatabase();
const QLatin1String mimetypesXml(":/qmlproject/QmlProject.mimetypes.xml"); const QLatin1String mimetypesXml(":/qmlproject/QmlProjectManager.mimetypes.xml");
if (! mimeDB->addMimeTypes(mimetypesXml, errorMessage)) if (! mimeDB->addMimeTypes(mimetypesXml, errorMessage))
return false; return false;
......
...@@ -146,5 +146,3 @@ RESOURCES += qt4projectmanager.qrc \ ...@@ -146,5 +146,3 @@ RESOURCES += qt4projectmanager.qrc \
include(qt-desktop/qt-desktop.pri) include(qt-desktop/qt-desktop.pri)
include(customwidgetwizard/customwidgetwizard.pri) include(customwidgetwizard/customwidgetwizard.pri)
OTHER_FILES += Qt4ProjectManager.mimetypes.xml
...@@ -26,7 +26,6 @@ QtcPlugin { ...@@ -26,7 +26,6 @@ QtcPlugin {
] ]
files: [ files: [
"Qt4ProjectManager.mimetypes.xml",
"addlibrarywizard.cpp", "addlibrarywizard.cpp",
"addlibrarywizard.h", "addlibrarywizard.h",
"buildconfigurationinfo.h", "buildconfigurationinfo.h",
......
...@@ -63,6 +63,3 @@ FORMS += \ ...@@ -63,6 +63,3 @@ FORMS += \
RESOURCES += \ RESOURCES += \
qtsupport.qrc qtsupport.qrc
OTHER_FILES += \
QtSupport.mimetypes.xml
...@@ -108,7 +108,6 @@ QtcPlugin { ...@@ -108,7 +108,6 @@ QtcPlugin {
"images/qml.png", "images/qml.png",
"images/qt_project.png", "images/qt_project.png",
"images/qt_qrc.png", "images/qt_qrc.png",
"QtSupport.mimetypes.xml",
] ]
Export { Export {
......
...@@ -15,5 +15,3 @@ resourcewizard.cpp \ ...@@ -15,5 +15,3 @@ resourcewizard.cpp \
resourceeditorw.cpp resourceeditorw.cpp
RESOURCES += resourceeditor.qrc RESOURCES += resourceeditor.qrc
OTHER_FILES += ResourceEditor.mimetypes.xml
...@@ -12,7 +12,6 @@ QtcPlugin { ...@@ -12,7 +12,6 @@ QtcPlugin {
cpp.includePaths: base.concat("qrceditor") cpp.includePaths: base.concat("qrceditor")
files: [ files: [
"ResourceEditor.mimetypes.xml",
"resourceeditor.qrc", "resourceeditor.qrc",
"resourceeditorconstants.h", "resourceeditorconstants.h",
"resourceeditorfactory.cpp", "resourceeditorfactory.cpp",
......
...@@ -24,5 +24,3 @@ SOURCES += annotationhighlighter.cpp \ ...@@ -24,5 +24,3 @@ SOURCES += annotationhighlighter.cpp \
FORMS += settingspage.ui FORMS += settingspage.ui
RESOURCES += subversion.qrc RESOURCES += subversion.qrc
OTHER_FILES += Subversion.mimetypes.xml
...@@ -13,7 +13,6 @@ QtcPlugin { ...@@ -13,7 +13,6 @@ QtcPlugin {
Depends { name: "Locator" } Depends { name: "Locator" }
files: [ files: [
"Subversion.mimetypes.xml",
"annotationhighlighter.cpp", "annotationhighlighter.cpp",
"annotationhighlighter.h", "annotationhighlighter.h",
"checkoutwizard.cpp", "checkoutwizard.cpp",
......
...@@ -13,5 +13,3 @@ SOURCES += tasklistplugin.cpp \ ...@@ -13,5 +13,3 @@ SOURCES += tasklistplugin.cpp \
taskfilefactory.cpp \ taskfilefactory.cpp \
RESOURCES += tasklist.qrc RESOURCES += tasklist.qrc
OTHER_FILES += TaskList.mimetypes.xml
...@@ -13,7 +13,6 @@ QtcPlugin { ...@@ -13,7 +13,6 @@ QtcPlugin {
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
files: [ files: [
"TaskList.mimetypes.xml",
"stopmonitoringhandler.cpp", "stopmonitoringhandler.cpp",
"stopmonitoringhandler.h", "stopmonitoringhandler.h",
"taskfile.cpp", "taskfile.cpp",
......
...@@ -237,5 +237,3 @@ FORMS += \ ...@@ -237,5 +237,3 @@ FORMS += \
tabsettingswidget.ui \ tabsettingswidget.ui \
codestyleselectorwidget.ui codestyleselectorwidget.ui
RESOURCES += texteditor.qrc RESOURCES += texteditor.qrc
OTHER_FILES += TextEditor.mimetypes.xml
...@@ -18,7 +18,6 @@ QtcPlugin { ...@@ -18,7 +18,6 @@ QtcPlugin {
]) ])
files: [ files: [
"TextEditor.mimetypes.xml",
"autocompleter.cpp", "autocompleter.cpp",
"autocompleter.h", "autocompleter.h",
"basefilefind.cpp", "basefilefind.cpp",
......
...@@ -70,5 +70,3 @@ FORMS += commonsettingspage.ui \ ...@@ -70,5 +70,3 @@ FORMS += commonsettingspage.ui \
basecheckoutwizardpage.ui \ basecheckoutwizardpage.ui \
cleandialog.ui \ cleandialog.ui \
submiteditorwidget.ui submiteditorwidget.ui
OTHER_FILES += VcsBase.mimetypes.xml
...@@ -14,7 +14,6 @@ QtcPlugin { ...@@ -14,7 +14,6 @@ QtcPlugin {
Depends { name: "CPlusPlus" } Depends { name: "CPlusPlus" }
files: [ files: [
"VcsBase.mimetypes.xml",
"baseannotationhighlighter.cpp", "baseannotationhighlighter.cpp",
"baseannotationhighlighter.h", "baseannotationhighlighter.h",
"basecheckoutwizard.cpp", "basecheckoutwizard.cpp",
......