diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-04-12 04:45:51 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-04-12 04:45:51 (GMT) |
| commit | 1e3b3551b8498e1f4dc92982e2a040ba90a6bf26 (patch) | |
| tree | dee1f64c3a9e26e07bc9cea00b90e800b932a6f2 /src/gui | |
| parent | 20a00436174faf746be14f5c36908710eeb44101 (diff) | |
| parent | 381ea9c22eb8f6b3701376a650202f094e17746d (diff) | |
| download | Qt-1e3b3551b8498e1f4dc92982e2a040ba90a6bf26.zip Qt-1e3b3551b8498e1f4dc92982e2a040ba90a6bf26.tar.gz Qt-1e3b3551b8498e1f4dc92982e2a040ba90a6bf26.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
doc/src/declarative/javascriptblocks.qdoc
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/gui.pro | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 4 | ||||
| -rw-r--r-- | src/gui/text/qfont.cpp | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index b22f732..300a03f 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -55,7 +55,7 @@ DEFINES += Q_INTERNAL_QAPP_SRC symbian { TARGET.UID3=0x2001B2DD - symbian-abld:symbian-sbsv2 { + symbian-abld|symbian-sbsv2 { # ro-section in gui can exceed default allocated space, so move rw-section a little further QMAKE_LFLAGS.ARMCC += --rw-base 0x800000 QMAKE_LFLAGS.GCCE += -Tdata 0xC00000 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) { diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 99b9f40..cb16a16 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -2614,8 +2614,10 @@ void QFontCache::cleanup() } QT_CATCH (const std::bad_alloc &) { // no cache - just ignore } - if (cache && cache->hasLocalData()) + if (cache && cache->hasLocalData()) { + cache->localData()->clear(); cache->setLocalData(0); + } } #endif // QT_NO_THREAD |