summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix bearer crashShane Kearns2011-11-161-1/+1
| | | | | | Handle could be closed too early in some situations causing a panic. Reviewed-By: mread
* Fix alignment of non-wrapped richtext QML Text elements.Miikka Heikkinen2011-11-161-1/+1
| | | | | | | | QTextDocument needs to know the actual control width rather than the text width to be able to align the text to the control. Task-number: ou1cimx1#934687 Reviewed-by: Joona Petrell
* Minor improvements to whatlog generation in Symbian tools2 builds.Miikka Heikkinen2011-11-151-4/+15
| | | | | | | | | | | - Generate temporary whatlog file under epoc32/build rather than the source directory. - Remove depenedency to qmake building from WHAT target to ensure nothing is built if "sbs -c tools2 --what" command is issued as that is supposed to just list what was built. Reviewed-by: Sami Merila
* Fix linux-symbian cross-compilation configure-phase for platform builingPasi Pentikainen2011-11-142-54/+76
| | | | | | | | | | | | | | | | | | | | | | When building Symbian platform itself, the lower layer libraries are not available on configure phase, and the config.test build scripts fail, creating false "NO"-flags (also config.test currently does not work with Symbian raptor). This fix aligns the configure results of configure-sh- script with configure.exe as far as possible and fixes couple of symbian cross-compilation configure issues, as detailed below: Configure sh-script: - Disable configure tests with symbian-sbsv2 where the failing test would result to invalid disable-flags - Skip applying of X11/Unix/Mac specific QCONFIG disable-flags that are not produced by configure.exe either - Fix emitting of "QT_NO_GUI" flag (in all environments) qtconfigure.flm: - Copy mkspecs as files to /epoc32/... instead of symbolic link Reviewed-by: Miikka Heikkinen Task-number: QTBUG-14361
* Fix memory leak in QCursorDataMiikka Heikkinen2011-11-101-0/+5
| | | | | | | QCursorData::cleanup() was never called on Symbian. Task-number: QTBUG-22643 Reviewed-by: Murray Read
* Merge remote-tracking branch 'flex/master'Pasi Pentikainen2011-11-101-0/+5
|\
| * Create cleanup stack in idleDetectorThreadhelanti2011-11-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | This is to fix a crash problem in idleDetectorThread. idleDetectorThread implementation may use cleanup stack. The culprit is QSysInfo::symbianVersion, which is called in QMutex implementation. The first call of QSysInfo::symbianVersion uses functions with cleanup stack usage. Later calls use cached version info and do not need cleanup stack. Without this fix, if idleDetectorThread starts before version information is cached, a crash happens. Reviewed-by: mread
* | WINSCW def file update so that qtgui can pick up virtual from qtcoremread2011-11-091-2/+3
| | | | | | | | | | | | | | | | QtGui needs the QEventDispatcherSymbian::reactivateDeferredActiveObjects virtual to be exported from QtCore Task-number: QTTH-1494 Reviewed-by: Shane Kearns
* | Add mobile-reduced ts-files for Symbian.Pasi Pentikainen2011-11-0969-42665/+15959
| | | | | | | | | | | | | | | | Add language files translated to all Symbian supported languages, reduced to items likely seen in Symbian. Task-Number: QTBUG-4919 Reviewed-by: Miikka Heikkinen
* | Preventing zero-timer lockups when Symbian's active scheduler usedmread2011-11-083-9/+155
|/ | | | | | | | | | | | | | | | | | | | | | Qt 4.7 had a deferred active object scheme to give Qt active objects some round robin behaviour with Symbian's active scheduler. Qt 4.8 has a round robin active scheduler which removed the need for any special support in Qt's active objects. Except it has been discovered that sometimes Symbian's active scheduler is used, and if Qt's zero-timer active objects are running at the time, they can prevent any other active objects from running in Symbian's scheduler, which can cause lockups. This change re-introduces the deferred active object system for Qt timer active objects. This means that a timer active object will only run once per processEvents() call when Symbian's active scheduler is used. Qt's round robin active scheduler already prevents an active object running more than once per processEvents(), so this change does not affect the normal case of using Qt's round robin scheduler. Task-number: QTTH-1494 Reviewed-by: Shane Kearns
* Fix memory leak in S60StyleMiikka Heikkinen2011-11-081-1/+3
| | | | | | | The m_animations contents were never deleted. Task-number: QTBUG-22603 Reviewed-by: Sami Merila
* Improve whatlog generation for Symbian tools2 builds.Miikka Heikkinen2011-11-032-91/+68
| | | | | | | | | - Headerexport script is only called once, whatlog is stored into a file - Sed is only called once - Properly added generated tools to whatlog Task-number: QTBUG-22521 Reviewed-by: Sami Merila
* Correct faulty 4.7->4.8 merge of Symbian def-filesLiang Qi2011-11-012-1482/+1473
| | | | | Done-with: Pasi Pentikainen Reviewed-by: Jani Hautakangas
* Merge remote-tracking branch 'qt/4.8'Pasi Pentikainen2011-11-01105-634/+13064
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-11-011-1/+1
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: SSL documentation: correct enum name
| | * SSL documentation: correct enum namePeter Hartmann2011-10-311-1/+1
| | |
| * | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-10-314-2/+116
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Symbian - disable memory mapping in QNetworkDiskCache Adding items to a view with no delegate crashes. Fix security problem on webpage due to bad JS Accepting predicted text using hardware keyboard replaces unwanted part Doc: adding link to the Qt Quick Components for Symbian page.
| | * \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-314-2/+116
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/mainpage.qdoc doc/src/platforms/supported-platforms.qdoc doc/src/qt-webpages.qdoc src/network/access/qnetworkdiskcache.cpp
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-10-281-1/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Symbian - disable memory mapping in QNetworkDiskCache
| | | | * | Symbian - disable memory mapping in QNetworkDiskCacheShane Kearns2011-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of memory mapped files in Open C requires munmap to be called from the same thread as mmap. As the QIODevice can be handed off to another thread, this breaks application code that works on other operating systems. Task-number: QT-5309 Reviewed-by: Tadaaki Matsumoto
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-10-279-59/+127
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Fix security problem on webpage due to bad JS Accepting predicted text using hardware keyboard replaces unwanted part Doc: adding link to the Qt Quick Components for Symbian page.
| | | | * | Merge remote-tracking branch 'upstream/4.7' into 4.7Sergio Ahumada2011-10-274-2/+27
| | | | |\ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | Conflicts: src/gui/inputmethod/qcoefepinputcontext_s60.cpp
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-272-0/+25
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Adding items to a view with no delegate crashes.
| | | | * | | Adding items to a view with no delegate crashes.Martin Jones2011-10-272-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no delegate then clear state and return. Change-Id: I786b9bc4018706797056fbd1ad25d25663102707 Task-number: QTBUG-22379 Reviewed-by: Andrew den Exter
| | | | | * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-217-62/+37
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Fix security problem on webpage due to bad JS Accepting predicted text using hardware keyboard replaces unwanted part
| | | | | | * | Fix security problem on webpage due to bad JSCasper van Donderen2011-10-215-59/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | | | * | Accepting predicted text using hardware keyboard replaces unwanted partSami Merila2011-10-212-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current implementation of Symbian input context assumes that predicted word replacement happens so that the original typed text is at the end of the surrounded text. The logic fails, if to-be-predicted text is in the middle of, or in the beginning of another, already accepted word. As a fix, input context need to store the original cursor position, when reset() was called (this happens when word selection list appears). Input context is already storing a copy of a preedit string in this situation. Then, when word replacement happens, this stored cursor position is used instead of current cursor position (the native side might temporarily move the cursor to the end when word selection list opens or closes) to replace the typed word with one selected from suggested word list. Stored cursor position is dismissed immediately after used, or if cached preedit string is dismissed. Task-number: QTBUG-22147 Reviewed-by: Miikka Heikkinen
| | | | | * | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-21132-716/+1892
| | | | | |\ \ \ | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (40 commits) Doc: adding link to the Qt Quick Components for Symbian page. Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4 Workaround to VideoCore III scissor bug. Fix to QGLWidget crash Update def files Fix crash on exit when overriding signal handlers in states. Typo fix Add new signals to indicate GPU resource usage. symbian - search drives for translation files symbian - search drives for translation files Cannot flick to the end of a horizontal list view width LayoutMirroring Backport more imports directory caching changes. Symbian - fix deleteLater not working from RunL Doc updates to installation, platform notes and symbian introduction. Do not let QGLContext get out of sync when doing mixed VG-GL rendering Fix more test DEPLOYMENT statements for Symbian Create auto test for http HEAD request QNAM - fix poor performance of HEAD request with authentication Fix deployment for declarative tests, examples on Symbian symbian - add support for ELangKazakh and ELangEnglish_India ...
| | | | | | * | Doc: adding link to the Qt Quick Components for Symbian page.Jerome Pasion2011-10-214-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-10-311-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Updated changelog for Qt 4.8
| | * | | | | | | Updated changelog for Qt 4.8Jo Asplin2011-10-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-226
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-10-311-1/+4
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix QFile::copy() returning false but error() being NoError
| | * | | | | | | Fix QFile::copy() returning false but error() being NoErrorxiechyong2011-10-311-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling close() after setError() will unset the error. Task-number: QTBUG-11982 Merge-request: 2712 Reviewed-by: ossi
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-10-2819-86/+81
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Symbian configuration parameter change for linux building Improve patch_capabilities script output. Fix QtSql autotest server addresses Update SQLite version number in legal document Update SQLite version mentioned in licence document Symbian Linuxification building case changes Fix FTP example to handle failure to open network session Use QBasicAtomicInt as a static variable FTP - fix interoperability issues with SIZE command QS60StyleAnimation exception safety Catch potential throw in ~QSymbianControl Fixed access to null threadData in ~QObjectPrivate Fix the build for makefile build system of Symbian Symbian - fix compile error when default configured
| | * \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-261-2/+2
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Symbian configuration parameter change for linux building
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-261-7/+8
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Improve patch_capabilities script output.
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-251-2/+8
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix QtSql autotest server addresses
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-251-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Update SQLite version number in legal document
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-241-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Update SQLite version mentioned in licence document
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-205-30/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Symbian Linuxification building case changes
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-203-26/+37
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix FTP example to handle failure to open network session Use QBasicAtomicInt as a static variable
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-186-15/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: FTP - fix interoperability issues with SIZE command QS60StyleAnimation exception safety Catch potential throw in ~QSymbianControl Fixed access to null threadData in ~QObjectPrivate Fix the build for makefile build system of Symbian
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-181-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Symbian - fix compile error when default configured
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-10-282-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Revert "Fixed deployment problems with MSVC 2005 and 2008 SP1"
| | * | | | | | | | | | | | | | | | | | Revert "Fixed deployment problems with MSVC 2005 and 2008 SP1"Joerg Bornemann2011-10-282-2/+2
| |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ec41d27565ed0b4d517f30563def135d0b4c7a8d. Adding the define _BIND_TO_CURRENT_VCLIBS_VERSION led to linking problems for several people. Also, this leads to problems when using the binary installer for development. Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-10-281-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: QIODevice - disallow setTextMode when not open
| | * | | | | | | | | | | | | | | | | QIODevice - disallow setTextMode when not openShane Kearns2011-10-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling setTextMode() before open() would make the device appear to be already open and cause later errors. Added a qWarning and documentation update to prevent this API misuse Task-number: QTBUG-20905 Change-Id: I2e06cd8e79f4afcf27417ac0eae6ebef980a17aa Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com> (cherry picked from commit 29c30a20bab4c4ea892b95c08c71bb5f136bb82c)
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-10-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Harfbuzz shaper: kerning adjustment does not need to be modified by RTL
| | * | | | | | | | | | | | | | | | | Harfbuzz shaper: kerning adjustment does not need to be modified by RTLJohn Tapsell2011-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1435 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-10-273-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fix possible crash in glyph cache when deleting and creating contexts