diff options
| author | Eike Ziller <[email protected]> | 2015-02-04 09:32:46 +0100 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2015-02-17 13:00:07 +0000 |
| commit | 5a3a940ad3b3984b308b539e7f0456ce11d4d90e (patch) | |
| tree | 539ac730a9291e9630c5772d78e5de1d9d4ece1e /src/plugins/qmljstools/qmljstoolsplugin.cpp | |
| parent | 365c1ddb903ebb8f183195244669499a300431d2 (diff) | |
Use new mime database
Change-Id: I4305872b6b11ef3e8a364280ffa5209a5a793600
Reviewed-by: Eike Ziller <[email protected]>
Diffstat (limited to 'src/plugins/qmljstools/qmljstoolsplugin.cpp')
| -rw-r--r-- | src/plugins/qmljstools/qmljstoolsplugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmljstools/qmljstoolsplugin.cpp b/src/plugins/qmljstools/qmljstoolsplugin.cpp index 114fabed712..15c1acb77f8 100644 --- a/src/plugins/qmljstools/qmljstoolsplugin.cpp +++ b/src/plugins/qmljstools/qmljstoolsplugin.cpp @@ -42,8 +42,8 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> -#include <coreplugin/mimedatabase.h> #include <coreplugin/progressmanager/progressmanager.h> +#include <utils/mimetypes/mimedatabase.h> #include <QtPlugin> #include <QMenu> @@ -72,9 +72,9 @@ QmlJSToolsPlugin::~QmlJSToolsPlugin() bool QmlJSToolsPlugin::initialize(const QStringList &arguments, QString *error) { Q_UNUSED(arguments) + Q_UNUSED(error) - if (!MimeDatabase::addMimeTypes(QLatin1String(":/qmljstools/QmlJSTools.mimetypes.xml"), error)) - return false; + Utils::MimeDatabase::addMimeTypes(QLatin1String(":/qmljstools/QmlJSTools.mimetypes.xml")); m_settings = new QmlJSToolsSettings(this); // force registration of qmljstools settings |