diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-10 04:16:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-10 04:16:20 (GMT) |
| commit | 7084f021bcd3ecc4d4cc4609b4185bcc6dc3a037 (patch) | |
| tree | 07ff4a289f5cba128ec2e2c0cec632f518fee7c2 /src/gui | |
| parent | 7690bab57ef7ae6d669c6df23e9de72fd8a85d62 (diff) | |
| parent | 617059a549a85e93cc9ef3130138c84d66871842 (diff) | |
| download | Qt-7084f021bcd3ecc4d4cc4609b4185bcc6dc3a037.zip Qt-7084f021bcd3ecc4d4cc4609b4185bcc6dc3a037.tar.gz Qt-7084f021bcd3ecc4d4cc4609b4185bcc6dc3a037.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix build error in QtGui armv5 udeb
Updated qtbench to build against modified QStaticText API
Make compiling / linking a non-qt app work too on symbian/gcce
When on Symbian use smaller files.
Fixing the missing "\\"
The cmd line arguments have not been delegated properly.
Clear QFontCache TLS content before nullifying TLS pointer.
Add --download option to runonphone
Implement download support to TRK Launcher
Fix library creation on symbian/gcce
Update Symbian def files for 4.7
Various fixes for symbian/gcce building.
Make encoding clear
Fix 'make sis' working on symbian makefile based system again.
Make shipped symbian scripts available from the build-dir bin dir.
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 |