diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs index 518df2a3a760736b0a2be6ff4f4bd7c9a55aeba4..7c530eb4fa4cbc1e1e6da39246507ecb75fe6505 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 514790e9be591a31250412bac4751e9879754a82..54fa00918202040587db7bef8bc85fe4124df548 100644 --- 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> diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro index bd83e368891b37b3f17e7f4e80303aad18d2eb45..4feae8c564c95826104be99d9d2072eca476905b 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 94e0f9ad1886759d1b7a50db4f60ce4886703fb0..4bfba21bbfa9b9e9ff35fcbfcb19759e5fc3f6b6 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 a7b139b14838f6a1b1c933ef67dbaca69bd0f736..9e4865e3ec5c4af1e08d2c2d6038b5d173659952 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 a5ba5b3a324d4df61e4ea5ce5c48c658074a6c58..d4fa42c38b1450ec48eacc8ea9f5e7c53fa822a3 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 de3aa40ae93543ac323c526322e6f936149b6d69..2264d7d47cad9dff2779f84cd5f88063b44dc458 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 3705dfac04b65a24cce3fdd1754acce9fd2978ce..4b5080980a6565852457ebd85f292100b7e9a255 100644 --- 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> diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro index 4b20e57114c97c5513aee6962e72da1e372886a2..5a79a0676e186022f6e306d43087480ef81ca45e 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 5006c3f7eea2423ea15db7f855894c348161d887..1d8ca15973b18d27d0733b3ae4ba3d801011c8aa 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 fb6521d9eb579f549fa9b85e1499480bedf09db6..4022c4a99dc61a24ee82f59a014d95c90737ccd0 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 a30931e0eb71f3363375aea3b818d0adc6e62e92..a78e22c7fe9177c65b20fe7878cf2e81e7a455b7 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 e910cfb6f95ef28833561957182e572af86aca31..b767890c1233fd18ec2b4df88d00423506157d2b 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 9d32eabfda6533938884395d04fcf3e6df6e34a9..9ecb32b06e549993196b0f5e848b5c972c808825 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 90b7f915231a37de35394a84441ca509c5660db8..d89725f59d82865995ce781d36e129766667c246 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 f739561cd5b85326a5788998ed276f9c54c87fe4..1a96f9f8d87335f79b8ba0754243b8f2922775f4 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 18a9aa76ed534aa6ebc1b78f6f3ac91d70da43c2..36102c3efc9bf85b456369a9538cdab8c4601323 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 e31e9270e7db98b5141b10cdd8399e797803245a..cd74fb94a2c01d4f5f8cff91df12564b698579aa 100644 --- 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> diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.pro b/src/plugins/genericprojectmanager/genericprojectmanager.pro index 3458f52fb69e992b96303b1e8bd5b15474410ed1..65528bcb6cd416723b3f41f148c23ff1b408d054 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 0a125ad02c2342e7b78d99b3982b0b58bc16215d..8a47a547cbc667595a298cae158219e95272d9b9 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 13089935bcec00ac1e1b8d9eefa59b5e6b9bf5a3..837fffece3973cf99f5bbd4fc74efa2557c91ea3 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 2a669e67777efd14b0a5b301231bc1612ff0ad7d..96af92c5fe0acaada013fc11477931717fa369ba 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 89abab418dc0d6f13ba25264a2c6be6842f2a0c1..1c626ff198f646c4d1d07d6b7700825683f7c9c5 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 84d742ba936c7bba54c329ca0eb2a054ab93f1f7..aef8a138a1915ea57f4b0b445cb0f604ff6f0b44 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 799b47ce441d59698d5041294829d595780d78bc..c34c479c3100e82d35b94b306788b792009b6594 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 c422cf993ca3711a0f5d6d1d46ba1c42e8baba48..0ef9d61a9b84105e80acba345b14507de235047c 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 79e5528baa431267ad06f039a17fc1911741239a..2f189e156349867ac7377521b375d9225cc780b1 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 0ebffbe03e2e6f508d9caf04d949f0ecc1804323..796a0c7a67df8b22221d3847fa9f9e79b30b8e84 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 c8d802cd3240a5f6e39b415c3f3ef8dc893e1d8e..ee31c909594f5508a72712972267916915cb3b36 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 614f7708830ac41302023045b946e08c80005d2d..a4e0c55675a039026a2dd01f2bce5706da92121b 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 0558ed8e87591fff53a8a5a0441300a816ed4fce..40b3ee891d811eea6831470192112a82c8c401de 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 48b9a1b4130620ba3a2842c74c838f94ae914adf..fe377a97d3caf2a62ec2d132c291fd005817b551 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 47440b45d95abe295eade3e3a07d3009451b4981..54222f801f86b3141a1828efa496ba9236414bc8 100644 --- 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> 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 21338b6a545c42dd2363d51089465b4af45129ca..2443c3f9aef59f2a3a8452542a8a7bf0143fcdf8 100644 --- 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> diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro index 468f48f200aa2944b4681ad04d6e7cc03de809dd..28888a726b0105440d21d7448e683598700bab6f 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 821ee8fefd8c85418430a9bbed7bc6aee1bea29c..eaf376ebc313d00f6db9c9d7a0dbb2affc56ead3 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 271e5245713ef47ab3d26c12eeff13aeeecf3b6d..fa4d7cb8e6a6ddf13c1051e2496c6edab95d3b50 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 3b2afbde65fe07fb410fa3301d73d036f2f0ebad..928abf016593035a4261973ed8750d7ac11db4c1 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 ccf3a654fbb8c56442c8ed9a4ae8f1f6d59710b2..557fe9495f75037242ab2744991a582dd22185e5 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 9ce54d9515d32388aa029ea602d4a1f30e4bf275..9229d5376a3d7f1c7c63683126e7cc2ec805fefe 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 0fff27ad2a8251810222cb0dca0d1777a915fa4c..b9bbe2f796bdb6e4425df74ff736a91bca8456e7 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 ca745af18402f1036627d22e00a30dbc600b2479..d10ddc591be0a86443ea9a7b5acd419f57d6a1d0 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 eb049c70adb00747a72f30740349c20006b6c160..35bf10acfb1c3396a486670162f1bca12b207c9b 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 1f7374e487430007a8135c107e6a37683a6493fb..6d2d9e21c02f787595331922e20039a54febded8 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 14face460e04b260b8737833c179dea25dc57119..ed5571e47c01b1f4b8201410d4d1f18e5278ba3e 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 9fccf0a4c136becbdd32058a034f11da1e9365a2..c4d89e9be9d491dc321edfafe26584e20810b27b 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 4b3b8a7b4552e9760c0fc89c3458e08a35287aaf..06fe2e39dafff7deeaddda25b755a2a9fe847e51 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 eaca9ab8d9ce996c3d4383e04eb628f3c4776a57..34b44634885f2018833bb38be652f8c6b52989ad 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 de50ca7bf7438833f8bb2abca3dea9d071131550..a004705c048f00140bd78135b97cecee460fcdef 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 ee0dc3b030fc932c92242ca956cfcec422601ca9..3faed8be6b0dfb331d2c02a1d795ecf99f05a24f 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 97e6a11b64acaea3458505ade8bdaac82020aaca..a3b1e11ca6fec59d237c8e8c2ddbb3ff3dc987cc 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 c12c7c417a22a786023537ca4ee0d6f48071b867..dcc12b4ba1dc303629d6511aaa82251cb6467136 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)