diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-02-08 14:31:55 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-02-27 13:54:59 +0000 |
| commit | d64e17ad55f155951fc76e4c2f04299aa9c7a912 (patch) | |
| tree | 16890479318c917c88392035a461e9edbcf76621 /src/plugins/android/androidplugin.cpp | |
| parent | ca1d1dfbe2c2b046b5661de20da9e20d4b511680 (diff) | |
Move mimetype definitions to plugin specs
- Avoids the hassle of QRC files and manually registering mime types
- Avoids performance regressions because of mime types that are
registered after mime database has been used
- Makes it technically possible to detect that a disabled plugin could
handle a mime type if it was enabled
Change-Id: I373008b1b56e9c6b4853055f20b3eeb112a6eff9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/android/androidplugin.cpp')
| -rw-r--r-- | src/plugins/android/androidplugin.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp index 4c6a31ab8b4..5619958ac11 100644 --- a/src/plugins/android/androidplugin.cpp +++ b/src/plugins/android/androidplugin.cpp @@ -52,8 +52,6 @@ #include <qtsupport/qtversionmanager.h> -#include <utils/mimetypes/mimedatabase.h> - #include <QtPlugin> using namespace ProjectExplorer; @@ -81,8 +79,6 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa addAutoReleasedObject(new Internal::JavaEditorFactory); KitManager::registerKitInformation(new Internal::AndroidGdbServerKitInformation); - Utils::MimeDatabase::addMimeTypes(QLatin1String(":/android/Android.mimetypes.xml")); - addAutoReleasedObject(new Internal::AndroidManifestEditorFactory); connect(KitManager::instance(), &KitManager::kitsLoaded, |