From 57265a20cba2a1d5990dffb857c9e68e58644e28 Mon Sep 17 00:00:00 2001
From: Jan-Arve Saether <jan-arve.saether@nokia.com>
Date: Mon, 6 Aug 2012 09:50:50 +0200
Subject: Make sure codecForLocale returns a valid codec in bootstrap mode

This was a regression caused by acbfb4d777474aadd2813614108,
causing for instance qdoc to crash.

Change-Id: Id8daa19d467c4f1729e5a5a203a388f16ec4a6de
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/corelib/codecs/qtextcodec.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index c376e10995..fb3151ba81 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -249,10 +249,10 @@ static QTextCodec *setupLocaleMapper()
             locale = checkForCodec("ISO 8859-15");
     }
 
+#endif
     // If everything failed, we default to 8859-1
     if (!locale)
         locale = QTextCodec::codecForName("ISO 8859-1");
-#endif
     globalData->codecForLocale.storeRelease(locale);
     return locale;
 }
-- 
cgit v1.2.3