From a40d390a3bbc1919843000b427a168180b83a344 Mon Sep 17 00:00:00 2001 From: Ruslan Nigmatullin Date: Mon, 31 Mar 2014 03:54:06 +0400 Subject: Fixed icons lookup in QIcon::fromTheme This commit fixes incorrect logic of icons' lookup if there are fallbacks or more than one theme's directory. According to Icon Theme Specification, Directory Layout section, theme can be spread across several base directories by having subdirectories of the same name. This makes possible to extend system themes by application-specific icons without making of collisions with other applications. According to Icon Naming Specification, Icon Naming Guidelines section, icon name may contain dashes to separate levels of specificity in icon names. This makes possible to set in application very specific icon which may be not in every theme. So it can fallback to less specific one. Change-Id: Iafc813902a3646be56e8f1d3a2fdbf8fd32ac542 Reviewed-by: Friedemann Kleint Reviewed-by: Olivier Goffart (Woboq GmbH) --- tests/auto/gui/image/qicon/qicon.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/auto/gui/image/qicon/qicon.pro') diff --git a/tests/auto/gui/image/qicon/qicon.pro b/tests/auto/gui/image/qicon/qicon.pro index f48fe90dd8..6ff20ec8fa 100644 --- a/tests/auto/gui/image/qicon/qicon.pro +++ b/tests/auto/gui/image/qicon/qicon.pro @@ -7,4 +7,4 @@ qtHaveModule(widgets): QT += widgets SOURCES += tst_qicon.cpp RESOURCES = tst_qicon.qrc -TESTDATA += icons/* *.png *.svg *.svgz +TESTDATA += icons/* second_icons/* *.png *.svg *.svgz -- cgit v1.2.3