diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-05-07 14:42:46 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-05-07 14:42:46 +0200 |
| commit | 4058ff6fe96e1a2e049700dfc7a5e7a120f29068 (patch) | |
| tree | 7106e67beabbf4309b9616475f70b73192d4a867 /src/plugins/glsleditor | |
| parent | fa704e0b8430da14ba86015e143a094286835934 (diff) | |
| parent | 13a947d119c4722461759f1aeb6b61e93e9be210 (diff) | |
Merge remote-tracking branch 'origin/3.4'
Conflicts:
src/libs/extensionsystem/pluginview.cpp
Change-Id: I410156c1003d5dc81e915110c6d432bcd71da010
Diffstat (limited to 'src/plugins/glsleditor')
| -rw-r--r-- | src/plugins/glsleditor/glsleditorplugin.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/glsleditor/glsleditorplugin.cpp b/src/plugins/glsleditor/glsleditorplugin.cpp index 3695c0ef83..75b4b8d162 100644 --- a/src/plugins/glsleditor/glsleditorplugin.cpp +++ b/src/plugins/glsleditor/glsleditorplugin.cpp @@ -147,17 +147,16 @@ bool GlslEditorPlugin::initialize(const QStringList & /*arguments*/, QString *er errorMessage->clear(); - FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png", Constants::GLSL_MIMETYPE); - FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png", Constants::GLSL_MIMETYPE_VERT); - FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png", Constants::GLSL_MIMETYPE_FRAG); - FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png", Constants::GLSL_MIMETYPE_VERT_ES); - FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png", Constants::GLSL_MIMETYPE_FRAG_ES); - return true; } void GlslEditorPlugin::extensionsInitialized() { + FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png", Constants::GLSL_MIMETYPE); + FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png", Constants::GLSL_MIMETYPE_VERT); + FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png", Constants::GLSL_MIMETYPE_FRAG); + FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png", Constants::GLSL_MIMETYPE_VERT_ES); + FileIconProvider::registerIconOverlayForMimeType(":/glsleditor/images/glslfile.png", Constants::GLSL_MIMETYPE_FRAG_ES); } ExtensionSystem::IPlugin::ShutdownFlag GlslEditorPlugin::aboutToShutdown() |