feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Display proper overlay icons on Windows/Qt 5.

Browse Source 
Task-number: QTBUG-27450

Change-Id: I521823dc586c304a5242a79f04489e5bc0fdb702
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Friedemann Kleint
2012-10-09 11:34:49 +02:00
committed by Eike Ziller
parent 1504ca67fb
commit 0869a13938
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/fileiconprovider.cpp
View File

@@ -138,7 +138,7 @@ QIcon FileIconProvider::icon(const QFileInfo &fileInfo) const
} }
} }
// Get icon from OS. // Get icon from OS.
#if defined(Q_WS_WIN) || defined(Q_OS_MAC) #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
return QFileIconProvider::icon(fileInfo); return QFileIconProvider::icon(fileInfo);
#else #else
// File icons are unknown on linux systems. // File icons are unknown on linux systems.

2
src/plugins/cppeditor/cppplugin.cpp
View File

@@ -83,7 +83,7 @@ CppEditorFactory::CppEditorFactory(CppPlugin *owner) :
<< QLatin1String(CppEditor::Constants::CPP_SOURCE_MIMETYPE) << QLatin1String(CppEditor::Constants::CPP_SOURCE_MIMETYPE)
<< QLatin1String(CppEditor::Constants::CPP_HEADER_MIMETYPE); << QLatin1String(CppEditor::Constants::CPP_HEADER_MIMETYPE);
#if !defined(Q_OS_MAC) && !defined(Q_WS_WIN) #if !defined(Q_OS_MAC) && !defined(Q_OS_WIN)
Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance(); Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance();
Core::MimeDatabase *mimeDatabase = Core::ICore::mimeDatabase(); Core::MimeDatabase *mimeDatabase = Core::ICore::mimeDatabase();
iconProvider->registerIconOverlayForMimeType(QIcon(QLatin1String(":/cppeditor/images/qt_cpp.png")), iconProvider->registerIconOverlayForMimeType(QIcon(QLatin1String(":/cppeditor/images/qt_cpp.png")),