From 67ff95079522d79e45d64d579856c5c1cd3a69d9 Mon Sep 17 00:00:00 2001 From: David Sansome Date: Wed, 24 Mar 2010 10:11:10 +0100 Subject: Add a check to make sure QTranslator doesn't load a directory. Merge-request: 531 Reviewed-by: Benjamin Poulain --- src/corelib/kernel/qtranslator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp index 7d1e1d3..ca54c6c 100644 --- a/src/corelib/kernel/qtranslator.cpp +++ b/src/corelib/kernel/qtranslator.cpp @@ -412,12 +412,12 @@ bool QTranslator::load(const QString & filename, const QString & directory, realname = prefix + fname + (suffix.isNull() ? QString::fromLatin1(".qm") : suffix); fi.setFile(realname); - if (fi.isReadable()) + if (fi.isReadable() && fi.isFile()) break; realname = prefix + fname; fi.setFile(realname); - if (fi.isReadable()) + if (fi.isReadable() && fi.isFile()) break; int rightmost = 0; -- cgit v0.12