From 5a3a940ad3b3984b308b539e7f0456ce11d4d90e Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 4 Feb 2015 09:32:46 +0100 Subject: Use new mime database Change-Id: I4305872b6b11ef3e8a364280ffa5209a5a793600 Reviewed-by: Eike Ziller --- src/plugins/git/gitplugin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/git/gitplugin.cpp') 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 #include #include -#include #include #include #include +#include #include #include @@ -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); -- cgit v1.2.1