diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs
index 518df2a3a76..7c530eb4fa4 100644
--- a/src/plugins/QtcPlugin.qbs
+++ b/src/plugins/QtcPlugin.qbs
@@ -44,6 +44,11 @@ Product {
fileTags: ["pluginSpecIn"]
}
+ Group {
+ name: "MimeTypes"
+ files: [ "*.mimetypes.xml" ]
+ }
+
Group {
fileTagsFilter: product.type
qbs.install: true
diff --git a/src/plugins/autotoolsprojectmanager/AutotoolsProject.mimetypes.xml b/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.mimetypes.xml
similarity index 100%
rename from src/plugins/autotoolsprojectmanager/AutotoolsProject.mimetypes.xml
rename to src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.mimetypes.xml
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.qrc b/src/plugins/autotoolsprojectmanager/autotoolsproject.qrc
index 514790e9be5..54fa0091820 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.qrc
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.qrc
@@ -1,5 +1,5 @@
- AutotoolsProject.mimetypes.xml
+ AutotoolsProjectManager.mimetypes.xml
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro
index bd83e368891..4feae8c564c 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro
@@ -32,5 +32,3 @@ SOURCES = autotoolsprojectplugin.cpp\
makefileparserthread.cpp\
makefileparser.cpp
RESOURCES += autotoolsproject.qrc
-
-OTHER_FILES += AutotoolsProject.mimetypes.xml
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
index 94e0f9ad188..4bfba21bbfa 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
@@ -12,7 +12,6 @@ QtcPlugin {
Depends { name: "CppTools" }
files: [
- "AutotoolsProject.mimetypes.xml",
"autogenstep.cpp",
"autogenstep.h",
"autoreconfstep.cpp",
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp b/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp
index a7b139b1483..9e4865e3ec5 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp
@@ -59,7 +59,7 @@ bool AutotoolsProjectPlugin::initialize(const QStringList &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;
addAutoReleasedObject(new AutotoolsBuildConfigurationFactory);
diff --git a/src/plugins/clearcase/clearcase.pro b/src/plugins/clearcase/clearcase.pro
index a5ba5b3a324..d4fa42c38b1 100644
--- a/src/plugins/clearcase/clearcase.pro
+++ b/src/plugins/clearcase/clearcase.pro
@@ -35,5 +35,3 @@ FORMS += checkoutdialog.ui \
versionselector.ui
RESOURCES += clearcase.qrc
-
-OTHER_FILES += ClearCase.mimetypes.xml
diff --git a/src/plugins/clearcase/clearcase.qbs b/src/plugins/clearcase/clearcase.qbs
index de3aa40ae93..2264d7d47ca 100644
--- a/src/plugins/clearcase/clearcase.qbs
+++ b/src/plugins/clearcase/clearcase.qbs
@@ -17,7 +17,6 @@ QtcPlugin {
Depends { name: "Locator" }
files: [
- "ClearCase.mimetypes.xml",
"activityselector.cpp",
"activityselector.h",
"annotationhighlighter.cpp",
diff --git a/src/plugins/cmakeprojectmanager/CMakeProject.mimetypes.xml b/src/plugins/cmakeprojectmanager/CMakeProjectManager.mimetypes.xml
similarity index 100%
rename from src/plugins/cmakeprojectmanager/CMakeProject.mimetypes.xml
rename to src/plugins/cmakeprojectmanager/CMakeProjectManager.mimetypes.xml
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.qrc b/src/plugins/cmakeprojectmanager/cmakeproject.qrc
index 3705dfac04b..4b5080980a6 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.qrc
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.qrc
@@ -1,5 +1,5 @@
- CMakeProject.mimetypes.xml
+ CMakeProjectManager.mimetypes.xml
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
index 4b20e57114c..5a79a0676e1 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
@@ -34,7 +34,3 @@ SOURCES = cmakeproject.cpp \
cmakevalidator.cpp
RESOURCES += cmakeproject.qrc
-
-FORMS +=
-
-OTHER_FILES += CMakeProject.mimetypes.xml
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
index 5006c3f7eea..1d8ca15973b 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
@@ -19,7 +19,7 @@ QtcPlugin {
]
files: [
- "CMakeProject.mimetypes.xml",
+ "CMakeProjectManager.mimetypes.xml",
"cmakebuildconfiguration.cpp",
"cmakebuildconfiguration.h",
"cmakeeditor.cpp",
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
index fb6521d9eb5..4022c4a99dc 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
@@ -57,7 +57,7 @@ CMakeProjectPlugin::~CMakeProjectPlugin()
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;
CMakeSettingsPage *cmp = new CMakeSettingsPage();
addAutoReleasedObject(cmp);
diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro
index a30931e0eb7..a78e22c7fe9 100644
--- a/src/plugins/cppeditor/cppeditor.pro
+++ b/src/plugins/cppeditor/cppeditor.pro
@@ -36,7 +36,6 @@ SOURCES += cppeditorplugin.cpp \
cpptypehierarchy.cpp
RESOURCES += cppeditor.qrc
-OTHER_FILES += CppEditor.mimetypes.xml
equals(TEST, 1) {
SOURCES += \
diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs
index e910cfb6f95..b767890c123 100644
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/src/plugins/cppeditor/cppeditor.qbs
@@ -17,7 +17,6 @@ QtcPlugin {
cpp.includePaths: base.concat("../../libs/3rdparty")
files: [
- "CppEditor.mimetypes.xml",
"cppautocompleter.cpp",
"cppautocompleter.h",
"cppclasswizard.cpp",
diff --git a/src/plugins/cvs/cvs.pro b/src/plugins/cvs/cvs.pro
index 9d32eabfda6..9ecb32b06e5 100644
--- a/src/plugins/cvs/cvs.pro
+++ b/src/plugins/cvs/cvs.pro
@@ -26,5 +26,3 @@ SOURCES += annotationhighlighter.cpp \
FORMS += settingspage.ui
RESOURCES += cvs.qrc
-
-OTHER_FILES += CVS.mimetypes.xml
diff --git a/src/plugins/cvs/cvs.qbs b/src/plugins/cvs/cvs.qbs
index 90b7f915231..d89725f59d8 100644
--- a/src/plugins/cvs/cvs.qbs
+++ b/src/plugins/cvs/cvs.qbs
@@ -13,7 +13,6 @@ QtcPlugin {
Depends { name: "Locator" }
files: [
- "CVS.mimetypes.xml",
"annotationhighlighter.cpp",
"annotationhighlighter.h",
"checkoutwizard.cpp",
diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro
index f739561cd5b..1a96f9f8d87 100644
--- a/src/plugins/designer/designer.pro
+++ b/src/plugins/designer/designer.pro
@@ -64,4 +64,4 @@ SOURCES += formeditorplugin.cpp \
RESOURCES += designer.qrc
-OTHER_FILES += Designer.mimetypes.xml README.txt
+OTHER_FILES += README.txt
diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs
index 18a9aa76ed5..36102c3efc9 100644
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -20,7 +20,6 @@ QtcPlugin {
])
files: [
- "Designer.mimetypes.xml",
"README.txt",
"codemodelhelpers.cpp",
"codemodelhelpers.h",
diff --git a/src/plugins/genericprojectmanager/GenericProject.mimetypes.xml b/src/plugins/genericprojectmanager/GenericProjectManager.mimetypes.xml
similarity index 100%
rename from src/plugins/genericprojectmanager/GenericProject.mimetypes.xml
rename to src/plugins/genericprojectmanager/GenericProjectManager.mimetypes.xml
diff --git a/src/plugins/genericprojectmanager/genericproject.qrc b/src/plugins/genericprojectmanager/genericproject.qrc
index e31e9270e7d..cd74fb94a2c 100644
--- a/src/plugins/genericprojectmanager/genericproject.qrc
+++ b/src/plugins/genericprojectmanager/genericproject.qrc
@@ -1,5 +1,5 @@
- GenericProject.mimetypes.xml
+ GenericProjectManager.mimetypes.xml
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.pro b/src/plugins/genericprojectmanager/genericprojectmanager.pro
index 3458f52fb69..65528bcb6cd 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.pro
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.pro
@@ -25,5 +25,3 @@ SOURCES = genericproject.cpp \
filesselectionwizardpage.cpp
RESOURCES += genericproject.qrc
FORMS += genericmakestep.ui
-
-OTHER_FILES += GenericProject.mimetypes.xml
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.qbs b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
index 0a125ad02c2..8a47a547cbc 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.qbs
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
@@ -16,7 +16,6 @@ QtcPlugin {
Depends { name: "QtSupport" }
files: [
- "GenericProject.mimetypes.xml",
"filesselectionwizardpage.cpp",
"filesselectionwizardpage.h",
"genericbuildconfiguration.cpp",
diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.cpp b/src/plugins/genericprojectmanager/genericprojectplugin.cpp
index 13089935bce..837fffece39 100644
--- a/src/plugins/genericprojectmanager/genericprojectplugin.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectplugin.cpp
@@ -71,7 +71,7 @@ bool GenericProjectPlugin::initialize(const QStringList &, QString *errorMessage
Core::MimeDatabase *mimeDB = ICore::mimeDatabase();
- const QLatin1String mimetypesXml(":genericproject/GenericProject.mimetypes.xml");
+ const QLatin1String mimetypesXml(":genericproject/GenericProjectManager.mimetypes.xml");
if (! mimeDB->addMimeTypes(mimetypesXml, errorMessage))
return false;
diff --git a/src/plugins/git/git.pro b/src/plugins/git/git.pro
index 2a669e67777..96af92c5fe0 100644
--- a/src/plugins/git/git.pro
+++ b/src/plugins/git/git.pro
@@ -64,6 +64,4 @@ include(gitorious/gitorious.pri)
RESOURCES += \
git.qrc
-OTHER_FILES += Git.mimetypes.xml
-
include(gerrit/gerrit.pri)
diff --git a/src/plugins/git/git.qbs b/src/plugins/git/git.qbs
index 89abab418dc..1c626ff198f 100644
--- a/src/plugins/git/git.qbs
+++ b/src/plugins/git/git.qbs
@@ -14,7 +14,6 @@ QtcPlugin {
Depends { name: "Locator" }
files: [
- "Git.mimetypes.xml",
"annotationhighlighter.cpp",
"annotationhighlighter.h",
"branchadddialog.cpp",
diff --git a/src/plugins/glsleditor/glsleditor.pro b/src/plugins/glsleditor/glsleditor.pro
index 84d742ba936..aef8a138a19 100644
--- a/src/plugins/glsleditor/glsleditor.pro
+++ b/src/plugins/glsleditor/glsleditor.pro
@@ -31,5 +31,4 @@ glslhoverhandler.cpp \
glslcompletionassist.cpp \
reuse.cpp
-OTHER_FILES += GLSLEditor.mimetypes.xml
RESOURCES += glsleditor.qrc
diff --git a/src/plugins/glsleditor/glsleditor.qbs b/src/plugins/glsleditor/glsleditor.qbs
index 799b47ce441..c34c479c310 100644
--- a/src/plugins/glsleditor/glsleditor.qbs
+++ b/src/plugins/glsleditor/glsleditor.qbs
@@ -14,7 +14,6 @@ QtcPlugin {
Depends { name: "CPlusPlus" }
files: [
- "GLSLEditor.mimetypes.xml",
"glslautocompleter.cpp",
"glslautocompleter.h",
"glslcompletionassist.cpp",
diff --git a/src/plugins/imageviewer/imageviewer.pro b/src/plugins/imageviewer/imageviewer.pro
index c422cf993ca..0ef9d61a9b8 100644
--- a/src/plugins/imageviewer/imageviewer.pro
+++ b/src/plugins/imageviewer/imageviewer.pro
@@ -20,9 +20,6 @@ SOURCES += \
RESOURCES += \
imageviewer.qrc
-OTHER_FILES += \
- ImageViewer.mimetypes.xml
-
greaterThan(QT_MAJOR_VERSION, 4) {
!isEmpty(QT.svg.name): QT += svg
else: DEFINES += QT_NO_SVG
diff --git a/src/plugins/imageviewer/imageviewer.qbs b/src/plugins/imageviewer/imageviewer.qbs
index 79e5528baa4..2f189e15634 100644
--- a/src/plugins/imageviewer/imageviewer.qbs
+++ b/src/plugins/imageviewer/imageviewer.qbs
@@ -9,7 +9,6 @@ QtcPlugin {
Depends { name: "Core" }
files: [
- "ImageViewer.mimetypes.xml",
"imageview.cpp",
"imageview.h",
"imageviewer.cpp",
diff --git a/src/plugins/perforce/perforce.pro b/src/plugins/perforce/perforce.pro
index 0ebffbe03e2..796a0c7a67d 100644
--- a/src/plugins/perforce/perforce.pro
+++ b/src/plugins/perforce/perforce.pro
@@ -32,5 +32,3 @@ FORMS += settingspage.ui \
submitpanel.ui
RESOURCES += perforce.qrc
-
-OTHER_FILES += Perforce.mimetypes.xml
diff --git a/src/plugins/perforce/perforce.qbs b/src/plugins/perforce/perforce.qbs
index c8d802cd324..ee31c909594 100644
--- a/src/plugins/perforce/perforce.qbs
+++ b/src/plugins/perforce/perforce.qbs
@@ -13,7 +13,6 @@ QtcPlugin {
Depends { name: "Locator" }
files: [
- "Perforce.mimetypes.xml",
"annotationhighlighter.cpp",
"annotationhighlighter.h",
"changenumberdialog.cpp",
diff --git a/src/plugins/pythoneditor/pythoneditor.mimetypes.xml b/src/plugins/pythoneditor/PythonEditor.mimetypes.xml
similarity index 100%
rename from src/plugins/pythoneditor/pythoneditor.mimetypes.xml
rename to src/plugins/pythoneditor/PythonEditor.mimetypes.xml
diff --git a/src/plugins/pythoneditor/pythoneditor.pro b/src/plugins/pythoneditor/pythoneditor.pro
index 614f7708830..a4e0c55675a 100644
--- a/src/plugins/pythoneditor/pythoneditor.pro
+++ b/src/plugins/pythoneditor/pythoneditor.pro
@@ -3,9 +3,6 @@ include(../../qtcreatorplugin.pri)
DEFINES += \
PYTHONEDITOR_LIBRARY
-OTHER_FILES += \
- pythoneditor.mimetypes.xml
-
RESOURCES += \
pythoneditorplugin.qrc
diff --git a/src/plugins/pythoneditor/pythoneditor.qbs b/src/plugins/pythoneditor/pythoneditor.qbs
index 0558ed8e875..40b3ee891d8 100644
--- a/src/plugins/pythoneditor/pythoneditor.qbs
+++ b/src/plugins/pythoneditor/pythoneditor.qbs
@@ -15,7 +15,6 @@ QtcPlugin {
files: [
"pythoneditor.cpp",
"pythoneditor.h",
- "pythoneditor.mimetypes.xml",
"pythoneditor_global.h",
"pythoneditorconstants.h",
"pythoneditorfactory.cpp",
diff --git a/src/plugins/pythoneditor/pythoneditorconstants.h b/src/plugins/pythoneditor/pythoneditorconstants.h
index 48b9a1b4130..fe377a97d3c 100644
--- a/src/plugins/pythoneditor/pythoneditorconstants.h
+++ b/src/plugins/pythoneditor/pythoneditorconstants.h
@@ -72,7 +72,7 @@ const char EN_PY_CPPMODULE_DESCRIPTION[] =
* MIME type
******************************************************************************/
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";
} // namespace Constants
diff --git a/src/plugins/pythoneditor/pythoneditorplugin.qrc b/src/plugins/pythoneditor/pythoneditorplugin.qrc
index 47440b45d95..54222f801f8 100644
--- a/src/plugins/pythoneditor/pythoneditorplugin.qrc
+++ b/src/plugins/pythoneditor/pythoneditorplugin.qrc
@@ -1,5 +1,5 @@
- pythoneditor.mimetypes.xml
+ PythonEditor.mimetypes.xml
diff --git a/src/plugins/qmlprojectmanager/QmlProject.mimetypes.xml b/src/plugins/qmlprojectmanager/QmlProjectManager.mimetypes.xml
similarity index 100%
rename from src/plugins/qmlprojectmanager/QmlProject.mimetypes.xml
rename to src/plugins/qmlprojectmanager/QmlProjectManager.mimetypes.xml
diff --git a/src/plugins/qmlprojectmanager/qmlproject.qrc b/src/plugins/qmlprojectmanager/qmlproject.qrc
index 21338b6a545..2443c3f9aef 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.qrc
+++ b/src/plugins/qmlprojectmanager/qmlproject.qrc
@@ -1,6 +1,6 @@
- QmlProject.mimetypes.xml
+ QmlProjectManager.mimetypes.xml
images/qmlfolder.png
images/qmlproject.png
images/qml_wizard.png
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
index 468f48f200a..28888a726b0 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
@@ -34,5 +34,3 @@ SOURCES += qmlproject.cpp \
qmlapplicationwizard.cpp
RESOURCES += qmlproject.qrc
-
-OTHER_FILES += QmlProject.mimetypes.xml
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
index 821ee8fefd8..eaf376ebc31 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
@@ -21,7 +21,6 @@ QtcPlugin {
"qmlapp.h",
"qmlapplicationwizard.cpp",
"qmlapplicationwizard.h",
- "QmlProject.mimetypes.xml",
"qmlproject.cpp",
"qmlproject.h",
"qmlproject.qrc",
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
index 271e5245713..fa4d7cb8e6a 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
@@ -62,7 +62,7 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
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))
return false;
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index 3b2afbde65f..928abf01659 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -146,5 +146,3 @@ RESOURCES += qt4projectmanager.qrc \
include(qt-desktop/qt-desktop.pri)
include(customwidgetwizard/customwidgetwizard.pri)
-
-OTHER_FILES += Qt4ProjectManager.mimetypes.xml
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
index ccf3a654fbb..557fe9495f7 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.qbs
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
@@ -26,7 +26,6 @@ QtcPlugin {
]
files: [
- "Qt4ProjectManager.mimetypes.xml",
"addlibrarywizard.cpp",
"addlibrarywizard.h",
"buildconfigurationinfo.h",
diff --git a/src/plugins/qtsupport/qtsupport.pro b/src/plugins/qtsupport/qtsupport.pro
index 9ce54d9515d..9229d5376a3 100644
--- a/src/plugins/qtsupport/qtsupport.pro
+++ b/src/plugins/qtsupport/qtsupport.pro
@@ -63,6 +63,3 @@ FORMS += \
RESOURCES += \
qtsupport.qrc
-
-OTHER_FILES += \
- QtSupport.mimetypes.xml
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index 0fff27ad2a8..b9bbe2f796b 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -108,7 +108,6 @@ QtcPlugin {
"images/qml.png",
"images/qt_project.png",
"images/qt_qrc.png",
- "QtSupport.mimetypes.xml",
]
Export {
diff --git a/src/plugins/resourceeditor/resourceeditor.pro b/src/plugins/resourceeditor/resourceeditor.pro
index ca745af1840..d10ddc591be 100644
--- a/src/plugins/resourceeditor/resourceeditor.pro
+++ b/src/plugins/resourceeditor/resourceeditor.pro
@@ -15,5 +15,3 @@ resourcewizard.cpp \
resourceeditorw.cpp
RESOURCES += resourceeditor.qrc
-
-OTHER_FILES += ResourceEditor.mimetypes.xml
diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs
index eb049c70adb..35bf10acfb1 100644
--- a/src/plugins/resourceeditor/resourceeditor.qbs
+++ b/src/plugins/resourceeditor/resourceeditor.qbs
@@ -12,7 +12,6 @@ QtcPlugin {
cpp.includePaths: base.concat("qrceditor")
files: [
- "ResourceEditor.mimetypes.xml",
"resourceeditor.qrc",
"resourceeditorconstants.h",
"resourceeditorfactory.cpp",
diff --git a/src/plugins/subversion/subversion.pro b/src/plugins/subversion/subversion.pro
index 1f7374e4874..6d2d9e21c02 100644
--- a/src/plugins/subversion/subversion.pro
+++ b/src/plugins/subversion/subversion.pro
@@ -24,5 +24,3 @@ SOURCES += annotationhighlighter.cpp \
FORMS += settingspage.ui
RESOURCES += subversion.qrc
-
-OTHER_FILES += Subversion.mimetypes.xml
diff --git a/src/plugins/subversion/subversion.qbs b/src/plugins/subversion/subversion.qbs
index 14face460e0..ed5571e47c0 100644
--- a/src/plugins/subversion/subversion.qbs
+++ b/src/plugins/subversion/subversion.qbs
@@ -13,7 +13,6 @@ QtcPlugin {
Depends { name: "Locator" }
files: [
- "Subversion.mimetypes.xml",
"annotationhighlighter.cpp",
"annotationhighlighter.h",
"checkoutwizard.cpp",
diff --git a/src/plugins/tasklist/tasklist.pro b/src/plugins/tasklist/tasklist.pro
index 9fccf0a4c13..c4d89e9be9d 100644
--- a/src/plugins/tasklist/tasklist.pro
+++ b/src/plugins/tasklist/tasklist.pro
@@ -13,5 +13,3 @@ SOURCES += tasklistplugin.cpp \
taskfilefactory.cpp \
RESOURCES += tasklist.qrc
-
-OTHER_FILES += TaskList.mimetypes.xml
diff --git a/src/plugins/tasklist/tasklist.qbs b/src/plugins/tasklist/tasklist.qbs
index 4b3b8a7b455..06fe2e39daf 100644
--- a/src/plugins/tasklist/tasklist.qbs
+++ b/src/plugins/tasklist/tasklist.qbs
@@ -13,7 +13,6 @@ QtcPlugin {
Depends { name: "TextEditor" }
files: [
- "TaskList.mimetypes.xml",
"stopmonitoringhandler.cpp",
"stopmonitoringhandler.h",
"taskfile.cpp",
diff --git a/src/plugins/texteditor/texteditor.pro b/src/plugins/texteditor/texteditor.pro
index eaca9ab8d9c..34b44634885 100644
--- a/src/plugins/texteditor/texteditor.pro
+++ b/src/plugins/texteditor/texteditor.pro
@@ -237,5 +237,3 @@ FORMS += \
tabsettingswidget.ui \
codestyleselectorwidget.ui
RESOURCES += texteditor.qrc
-OTHER_FILES += TextEditor.mimetypes.xml
-
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index de50ca7bf74..a004705c048 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -18,7 +18,6 @@ QtcPlugin {
])
files: [
- "TextEditor.mimetypes.xml",
"autocompleter.cpp",
"autocompleter.h",
"basefilefind.cpp",
diff --git a/src/plugins/vcsbase/vcsbase.pro b/src/plugins/vcsbase/vcsbase.pro
index ee0dc3b030f..3faed8be6b0 100644
--- a/src/plugins/vcsbase/vcsbase.pro
+++ b/src/plugins/vcsbase/vcsbase.pro
@@ -70,5 +70,3 @@ FORMS += commonsettingspage.ui \
basecheckoutwizardpage.ui \
cleandialog.ui \
submiteditorwidget.ui
-
-OTHER_FILES += VcsBase.mimetypes.xml
diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs
index 97e6a11b64a..a3b1e11ca6f 100644
--- a/src/plugins/vcsbase/vcsbase.qbs
+++ b/src/plugins/vcsbase/vcsbase.qbs
@@ -14,7 +14,6 @@ QtcPlugin {
Depends { name: "CPlusPlus" }
files: [
- "VcsBase.mimetypes.xml",
"baseannotationhighlighter.cpp",
"baseannotationhighlighter.h",
"basecheckoutwizard.cpp",
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri
index c12c7c417a2..dcc12b4ba1d 100644
--- a/src/qtcreatorplugin.pri
+++ b/src/qtcreatorplugin.pri
@@ -136,5 +136,8 @@ linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
INSTALLS += target pluginspec
}
+MIMETYPES = $$_PRO_FILE_PWD_/$${TARGET}.mimetypes.xml
+exists($$MIMETYPES):OTHER_FILES += $$MIMETYPES
+
TARGET = $$qtLibraryName($$TARGET)