From 2041f4eae8e2ac9e144647e86f800484d0ef7438 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Sun, 3 Mar 2013 19:08:35 +0400 Subject: [PATCH] QIcon: ensure that QIconLoader is initialized Make sure that QIconLoader is initialized when QIcon::themeName() is called. Otherwise, themeName() may return the wrong value. Change-Id: I54621e31da24bdbe745e7d6ae6a1d58cb4190cd7 Reviewed-by: Jens Bache-Wiig --- src/gui/image/qicon.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index dce902301c..a297c32b3c 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -945,6 +945,7 @@ void QIcon::setThemeName(const QString &name) */ QString QIcon::themeName() { + QIconLoader::instance()->ensureInitialized(); return QIconLoader::instance()->themeName(); }