summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDmitry Shachnev <mitya57@gmail.com>2013-03-03 19:08:35 +0400
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-06 17:26:08 +0100
commit2041f4eae8e2ac9e144647e86f800484d0ef7438 (patch)
treef6374d47522c4860f7275053e41189304d47bed1 /src
parent4520cb98659960e343a3bcbcf4477858971290dc (diff)
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 <jens.bache-wiig@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/gui/image/qicon.cpp1
1 files changed, 1 insertions, 0 deletions
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();
}