--- a/src/gui/inputmethod/qinputcontextfactory.cpp	Wed Jun 23 19:07:03 2010 +0300
+++ b/src/gui/inputmethod/qinputcontextfactory.cpp	Tue Jul 06 15:10:48 2010 +0300
@@ -73,7 +73,7 @@
 #endif
 #ifdef Q_WS_S60
 #include "qcoefepinputcontext_p.h"
-#include "AknInputLanguageInfo.h"
+#include "akninputlanguageinfo.h"
 #endif
 
 #include "private/qfactoryloader_p.h"
@@ -81,7 +81,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
+#ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QInputContextFactoryInterface_iid, QLatin1String("/inputmethods")))
 #endif
@@ -153,7 +153,7 @@
         result = new QCoeFepInputContext;
     }
 #endif
-#if defined(QT_NO_LIBRARY) || defined(QT_NO_SETTINGS)
+#ifdef QT_NO_LIBRARY
     Q_UNUSED(key);
 #else
     if (QInputContextFactoryInterface *factory =
@@ -193,7 +193,7 @@
 #if defined(Q_WS_S60)
     result << QLatin1String("coefep");
 #endif
-#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
+#ifndef QT_NO_LIBRARY
     result += loader()->keys();
 #endif // QT_NO_LIBRARY
     return result;