diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-10-09 11:34:49 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-09 12:34:34 +0200 |
| commit | 0869a1393835f914e183607977a901b085a60d72 (patch) | |
| tree | d8b326cd534e9b16565f43a81ddca3bc354a560e | |
| parent | 1504ca67fb0c611a5f6b91eeb61f4484ed661e9c (diff) | |
| download | qt-creator-0869a1393835f914e183607977a901b085a60d72.tar.gz | |
Display proper overlay icons on Windows/Qt 5.
Task-number: QTBUG-27450
Change-Id: I521823dc586c304a5242a79f04489e5bc0fdb702
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| -rw-r--r-- | src/plugins/coreplugin/fileiconprovider.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/cppeditor/cppplugin.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/coreplugin/fileiconprovider.cpp b/src/plugins/coreplugin/fileiconprovider.cpp index d42a321db1..48f84706f0 100644 --- a/src/plugins/coreplugin/fileiconprovider.cpp +++ b/src/plugins/coreplugin/fileiconprovider.cpp @@ -138,7 +138,7 @@ QIcon FileIconProvider::icon(const QFileInfo &fileInfo) const } } // 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); #else // File icons are unknown on linux systems. diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp index 268e8980e7..4f4176bb05 100644 --- a/src/plugins/cppeditor/cppplugin.cpp +++ b/src/plugins/cppeditor/cppplugin.cpp @@ -83,7 +83,7 @@ CppEditorFactory::CppEditorFactory(CppPlugin *owner) : << QLatin1String(CppEditor::Constants::CPP_SOURCE_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::MimeDatabase *mimeDatabase = Core::ICore::mimeDatabase(); iconProvider->registerIconOverlayForMimeType(QIcon(QLatin1String(":/cppeditor/images/qt_cpp.png")), |