Streamline mimetypes.xml files

Change-Id: I4f2a28d4732ea496f574e5f51fb1e1633ebca99d Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-28 20:53:12 +03:00
parent 67c3fed2c0
commit 029fd5a572
57 changed files with 20 additions and 72 deletions
--- 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
--- a/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.mimetypes.xml
+++ b/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.mimetypes.xml
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.qrc
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.qrc
@@ -1,5 +1,5 @@
 <RCC>
    <qresource prefix="/autotoolsproject" >
-        <file>AutotoolsProject.mimetypes.xml</file>
+        <file>AutotoolsProjectManager.mimetypes.xml</file>
    </qresource>
 </RCC>
--- 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
--- 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",
--- 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);
--- 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
--- 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",
--- a/src/plugins/cmakeprojectmanager/CMakeProjectManager.mimetypes.xml
+++ b/src/plugins/cmakeprojectmanager/CMakeProjectManager.mimetypes.xml
--- a/src/plugins/cmakeprojectmanager/cmakeproject.qrc
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.qrc
@@ -1,5 +1,5 @@
 <RCC>
    <qresource prefix="/cmakeproject">
-        <file>CMakeProject.mimetypes.xml</file>
+        <file>CMakeProjectManager.mimetypes.xml</file>
    </qresource>
 </RCC>
--- 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
--- 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",
--- 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);
--- 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 += \
--- 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",
--- 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
--- 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",
--- 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
--- 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",
--- a/src/plugins/genericprojectmanager/GenericProjectManager.mimetypes.xml
+++ b/src/plugins/genericprojectmanager/GenericProjectManager.mimetypes.xml
--- a/src/plugins/genericprojectmanager/genericproject.qrc
+++ b/src/plugins/genericprojectmanager/genericproject.qrc
@@ -1,5 +1,5 @@
 <RCC>
    <qresource prefix="/genericproject" >
-        <file>GenericProject.mimetypes.xml</file>
+        <file>GenericProjectManager.mimetypes.xml</file>
    </qresource>
 </RCC>
--- 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
--- 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",
--- 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;
--- 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)
--- 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",
--- 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
--- 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",
--- 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
--- 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",
--- 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
--- 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",
--- a/src/plugins/pythoneditor/PythonEditor.mimetypes.xml
+++ b/src/plugins/pythoneditor/PythonEditor.mimetypes.xml
--- 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

--- 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",
--- 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
--- a/src/plugins/pythoneditor/pythoneditorplugin.qrc
+++ b/src/plugins/pythoneditor/pythoneditorplugin.qrc
@@ -1,5 +1,5 @@
 <RCC>
    <qresource prefix="/pythoneditor">
-        <file>pythoneditor.mimetypes.xml</file>
+        <file>PythonEditor.mimetypes.xml</file>
    </qresource>
 </RCC>
--- a/src/plugins/qmlprojectmanager/QmlProjectManager.mimetypes.xml
+++ b/src/plugins/qmlprojectmanager/QmlProjectManager.mimetypes.xml
--- a/src/plugins/qmlprojectmanager/qmlproject.qrc
+++ b/src/plugins/qmlprojectmanager/qmlproject.qrc
@@ -1,6 +1,6 @@
 <RCC>
    <qresource prefix="/qmlproject">
-        <file>QmlProject.mimetypes.xml</file>
+        <file>QmlProjectManager.mimetypes.xml</file>
        <file>images/qmlfolder.png</file>
        <file>images/qmlproject.png</file>
        <file>images/qml_wizard.png</file>
--- 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
--- 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",
--- 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;
--- 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
--- 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",
--- 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
--- 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 {
--- 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
--- 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",
--- 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
--- 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",
--- 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
--- 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",
--- 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
-
--- 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",
--- 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
--- 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",
--- 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)