diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-30 08:44:56 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-30 08:44:56 (GMT) |
| commit | 36c82d1a6c6d84b95c65b9df48d38093cadfd94a (patch) | |
| tree | f172db63847b2240f22db5fae4df07a9eab0fa7e /src/gui/kernel/qapplication.cpp | |
| parent | 1acc9bcf4c43851af2096539eda88da9ef58bce3 (diff) | |
| parent | b371999d3e9c207047be6afda89d008b6cf04763 (diff) | |
| download | Qt-36c82d1a6c6d84b95c65b9df48d38093cadfd94a.zip Qt-36c82d1a6c6d84b95c65b9df48d38093cadfd94a.tar.gz Qt-36c82d1a6c6d84b95c65b9df48d38093cadfd94a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index be2683d..b0a23d4 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -5292,9 +5292,9 @@ QInputContext *QApplication::inputContext() const QApplication *that = const_cast<QApplication *>(this); const QStringList keys = QInputContextFactory::keys(); // Try hbim and coefep first, then try others. - if (keys.contains("hbim")) { + if (keys.contains(QLatin1String("hbim"))) { that->d_func()->inputContext = QInputContextFactory::create(QLatin1String("hbim"), that); - } else if (keys.contains("coefep")) { + } else if (keys.contains(QLatin1String("coefep"))) { that->d_func()->inputContext = QInputContextFactory::create(QLatin1String("coefep"), that); } else { for (int c = 0; c < keys.size() && !d->inputContext; ++c) { |