diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-02-04 09:32:46 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-02-17 13:00:07 +0000 |
| commit | 5a3a940ad3b3984b308b539e7f0456ce11d4d90e (patch) | |
| tree | 539ac730a9291e9630c5772d78e5de1d9d4ece1e /src/plugins/git/gitplugin.cpp | |
| parent | 365c1ddb903ebb8f183195244669499a300431d2 (diff) | |
| download | qt-creator-5a3a940ad3b3984b308b539e7f0456ce11d4d90e.tar.gz | |
Use new mime database
Change-Id: I4305872b6b11ef3e8a364280ffa5209a5a793600
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/git/gitplugin.cpp')
| -rw-r--r-- | src/plugins/git/gitplugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 552d16232b..222d76bd72 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -59,11 +59,11 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> #include <coreplugin/locator/commandlocator.h> -#include <coreplugin/mimedatabase.h> #include <coreplugin/vcsmanager.h> #include <coreplugin/coreconstants.h> #include <coreplugin/messagebox.h> +#include <utils/mimetypes/mimedatabase.h> #include <utils/qtcassert.h> #include <utils/parameteraction.h> @@ -269,6 +269,7 @@ QAction *GitPlugin::createRepositoryAction(ActionContainer *ac, bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage) { Q_UNUSED(arguments) + Q_UNUSED(errorMessage) Context context(Constants::GIT_CONTEXT); @@ -655,8 +656,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage) connect(VcsManager::instance(), SIGNAL(repositoryChanged(QString)), this, SLOT(updateBranches(QString)), Qt::QueuedConnection); - if (!MimeDatabase::addMimeTypes(QLatin1String(RC_GIT_MIME_XML), errorMessage)) - return false; + Utils::MimeDatabase::addMimeTypes(QLatin1String(RC_GIT_MIME_XML)); /* "Gerrit" */ m_gerritPlugin = new Gerrit::Internal::GerritPlugin(this); |