summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-032-1/+1
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: rename qt_iw.ts to qt_he.ts
| * rename qt_iw.ts to qt_he.tsOswald Buddenhagen2010-05-032-1/+1
| | | | | | | | | | iw comes from the obsolete ISO639. we are using ISO639-1 or something newer.
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-031-0/+2
|\ \ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: QComboBoxPrivateScroller draws holes into menu canvas
| * | QS60Style: QComboBoxPrivateScroller draws holes into menu canvasSami Merila2010-05-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QComboBoxPrivateScroller calls eraserects for menu scroller areas, expecting the style to fill the gaps. Unfortunately, the QS60Style does not draw menu scrollers at all (but they are functional when interacted with). Therefore, these areas are now drawn as holes. As a fix, the eraseRect call from provate class QComboBoxPrivateScroller is removed when "s60 flag" is defined. Task-number: QTBUG-10371 Reviewed-by: Janne Koskinen
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-032-11/+94
|\ \ \ | |/ / | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: QTabWidget Usability issue with capacitive screens
| * | QS60Style: QTabWidget Usability issue with capacitive screensSami Merila2010-05-032-11/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally Qt uses scrollbuttons together at right (for LeftToRight UI) side of the horizontal QTabBar; for vertical tab bar, scrollbuttons are displayed below/above the widget. Using QTabBar's scroll buttons with touch device that has capacitive screen, is somewhat hard as the touch area for either of the scroll buttons is somewhat smallish. So user is experiencing frequent wrong taps. Making the touch area larger, would make the tabbar tab shape area smaller, so it isn't a very good solution. Therefore, when QS60Style is in use, QTabWidget draws the scrollbuttons on either side of the QTabBar. Task-number: QT-3104 Reviewed-by: Alessandro Portale
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-031-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixing small memory leak in testlib.
| * | Fixing small memory leak in testlib.Aleksandar Sasha Babic2010-05-031-0/+1
|/ / | | | | | | Reviewed-by: Jason Barron
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-011-17/+40
|\ \ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix bold text rendering of Thai and Vietnamese on Symbian
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-301-17/+40
| |\ \ | | |/ | |/| | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix bold text rendering of Thai and Vietnamese on Symbian
| | * Fix bold text rendering of Thai and Vietnamese on SymbianAlessandro Portale2010-04-301-17/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Symbian Qt font database made the wrong assumption that a font face name maps one to one to a font. That led to a mismaptch between actual font face variants (bold) versus the retrieved font tables. S60, usually comes with two 'Series 60 Sans' font files where one is semi bold. The rasterizer plugin merges both fonts to one and returns the semi bold font if a bold font is requested, otherwise it returns the normal font. Both font files have slight differences in the cmap. Qt's font implementation always retrieved the font tables for the normal font even if it drew the bold font. That led to wrong glyphs in some languages (Thai, Vietnamese), thanks to the cmap differences. This fix makes sure that when retrieving the font tables, bold and italic are considered. It avoids innecessary double allocations of MOpenFontTrueTypeExtension instances. Also the ChunkHeap size of m_heap does now depend on the number of loaded font files. Task-number: QTBUG-6812 Reviewed-by: Aleksandar Sasha Babic
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-014-13/+32
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed a leak in QTextDocument::print(). Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-304-13/+32
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed a leak in QTextDocument::print(). Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-304-13/+32
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed a leak in QTextDocument::print(). Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
| | * | Fixed a leak in QTextDocument::print().Trond Kjernåsen2010-04-292-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed a typo in the QScopedPointer docs. Task-number: QTBUG-10301 Reviewed-by: Kim
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-292-5/+27
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
| | | * | Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.Jan-Arve Sæther2010-04-292-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When focusInEvent is called we need to ensure that WA_InputMethodEnabled is set, since FocusInEvent might lead to that QInputContext::setFocusWidget is called (with the QGraphicsView as the widget parameter). However, if the widget still does not have WA_InputMethodEnabled set yet it will assert in QInputContext::setFocusWidget (it requires that the widget has the flag set). This was a problem for the morbit bridge, where Dui requires the attribute to be set (while Orbit actually does not require) Task-number: QTBUG-10276 Reviewed-by: jasplin Reviewed-by: Alexis Menard
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-303-3/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix crash in QDBusInterface when invoking a method in a derived class. tst_selftest: Fix off-by-one error in cleaning up line numbers and filenames
| * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-303-3/+25
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix crash in QDBusInterface when invoking a method in a derived class. tst_selftest: Fix off-by-one error in cleaning up line numbers and filenames
| | * | | | Fix crash in QDBusInterface when invoking a method in a derived class.Thiago Macieira2010-04-292-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If metaObject is 0 and the signal or slot is in a class deriving from QDBusInterface, this would lead to a crash. Deriving from QDBusInterface is very unusual and usually indicates misunderstanding of QtDBus, but the fix is correct. Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=165175 Patch-By: Maemo developer Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | | tst_selftest: Fix off-by-one error in cleaning up line numbers and filenamesThiago Macieira2010-04-291-2/+2
| | |/ / /
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-303-38/+96
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Event dispatcher slow down using delays rather than thread priority Fixed incorrect runtime platform version check in Phonon MMF backend
| * | | Event dispatcher slow down using delays rather than thread prioritymread2010-04-302-37/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Symbian event dispatcher has a mechanism to slow down the Qt app to prevent viewsrv crashes and keep the device responsive. This was implemented using a thread priority drop. But that has some bad side effects, such as app and system performance instability. This new implementation of a slow down mechanism uses a separate low priority thread to test when the system is getting too busy. Adaptive millisecond waits are used to slow the app down just enough to let the low prioirity thread to run. In practice this avoids the performance instability of the previous method, and results in much better system stability where the system stays more responsive with fewer viewsrv panics when heavy Qt apps are running. The slow down code kicks in after 2 seconds of busy time. The delays grow 1ms at a time to a maximum of 1/4 of average event run time. This updated version of the fix used an RSemaphore rather than RFastlock, which should not have been used for cross-thread signalling. Task-number: QTBUG-9489 Reviewed-by: Shane Kearns
| * | | Fixed incorrect runtime platform version check in Phonon MMF backendGareth Stockwell2010-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In S60 3.2, CMdaAudioPlayerUtility::SetVolume(TInt) was changed from having a void return type to returning TInt. The code in the Phonon MMF backend which calls this function uses a runtime platform version check to ensure that only on S60 3.2 and above is the return value from SetVolume treated as valid. This check was previously testing for the wrong platform version (5.0 rather than 3.2). Reviewed-by: Shane Kearns
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-307-126/+47
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removing unused code. Support 'Text' mode in Symbian specific input methods Map Symbian touch points to the screen's coordinate system. Revert "Event dispatcher slow down using delays rather than thread priority" Fix long menu item texts causing crash
| * | Removing unused code.Alessandro Portale2010-04-302-27/+2
| | | | | | | | | | | | | | | | | | | | | MOpenFontShapingExtension was not used. Cleaning up and reducing delta between branches Reviewed-by: Aleksandar Sasha Babic
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-295-99/+45
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support 'Text' mode in Symbian specific input methods Map Symbian touch points to the screen's coordinate system. Revert "Event dispatcher slow down using delays rather than thread priority" Fix long menu item texts causing crash
| * | Support 'Text' mode in Symbian specific input methodsSami Merila2010-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default values for QCoeFepInputContext are set so that lower ('ab') and upper cases ('AB') are supported. Without any input method hints, input mode widgets cannot get into text mode ('Ab') at all. Changed the implementation so that default value is 'Text' like in native S60 devices. Task-number: QTBUG-10006 Reviewed-by: Janne Koskinen
| * | Map Symbian touch points to the screen's coordinate system.Jason Barron2010-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The 'iPosition' that we receive from the TAdvancedPointerEvent is relative to the origin of the window that received the event, not the screen so it needs to mapped to be correct. Reviewed-by: Bradley T. Hughes
| * | Revert "Event dispatcher slow down using delays rather than thread priority"Miikka Heikkinen2010-04-292-95/+37
| | | | | | | | | | | | | | | | | | | | | This reverts commit 99dbc23113eaf40f4e311eb0f21092e54676bd10. This commit caused UI to freeze on gui applications on older phones such as 5800XM and N95.
| * | Fix long menu item texts causing crashMiikka Heikkinen2010-04-291-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian uses buffer of CEikMenuPaneItem::SData::ENominalTextLength characters for menu item texts, so truncate any text that is longer than that. Task-number: QTBUG-10207 Reviewed-by: Janne Anttila
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-281-11/+84
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: tst_selftest: parse benchlib results in XML format too tst_selftests: replace a line number with __LINE__ in XML too
| * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-281-11/+84
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: tst_selftest: parse benchlib results in XML format too tst_selftests: replace a line number with __LINE__ in XML too
| | * | | tst_selftest: parse benchlib results in XML format tooThiago Macieira2010-04-281-1/+67
| | | | |
| | * | | tst_selftests: replace a line number with __LINE__ in XML tooThiago Macieira2010-04-281-10/+17
| | | | |
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-284-46/+46
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Renaming a few unexported, private symbols
| * | | Renaming a few unexported, private symbolsAlessandro Portale2010-04-284-46/+46
|/ / / | | | | | | | | | | | | | | | | | | | | | That reduces the delta between 4.6/4.7 and a patch that I am pre- paring for Symbian^4. The renaming will help me a lot when main- taining font issues on 4.6 and 4.7 and different Symbian versions. Reviewed-by: trustme
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-282-18/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed fullscreen responsiveness of softkeys
| * | | Removed fullscreen responsiveness of softkeysMiikka Heikkinen2010-04-282-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CEikCba class casting is not binary compatible between at least S60 3.2 and 5.0 platforms, even though it is source compatible. The removed code was causing stack corruption on emulator when binaries were built on S60 3.2 SDK and run on S60 5.0 SDK. Another solution for this feature needs to be found. Task-number: QTBUG-10199 Reviewed-by: Shane Kearns Reviewed-by: Janne Anttila
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-2894-187/+187
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: tst_selftest: use @INSERT_QT_VERSION_HERE@ to indicate the Qt version.
| * | | tst_selftest: use @INSERT_QT_VERSION_HERE@ to indicate the Qt version.Thiago Macieira2010-04-2894-187/+187
|/ / / | | | | | | | | | Otherwise, the tests break when the Qt version changes
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-274-4/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix crash in QXmlStreamReader
| * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-274-4/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix crash in QXmlStreamReader
| | * | | fix crash in QXmlStreamReaderPeter Hartmann2010-04-274-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this fixes a possible off-by-one data corruption which apparently is only triggered in rare circumstances. The problem was: We were checking whether we would need to reallocate the stack (line 1245), but sometimes were incrementing tos (line 1278) and then accessing the state stack at an out-of-bounds position (line 1951). Additionally, adapt the qlalr generator for changes made to qxmlstream_p.h directly and recreate that file with qlalr. Reviewed-by: Frans Englich Reviewed-by: Roberto Raggi Task-number: QTBUG-9196
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-271-32/+1
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: The cmd line arguments have not been delegated properly.
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-271-32/+1
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: The cmd line arguments have not been delegated properly.
| * | | The cmd line arguments have not been delegated properly.Aleksandar Sasha Babic2010-04-271-32/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QT-9377 Reviewed-by: Joao
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-271-3/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed a QFontEngine leak for QFont objects used in threads.
| * | | Fixed a QFontEngine leak for QFont objects used in threads.Trond Kjernåsen2010-04-271-3/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Only the QFontCache object for the main thread was cleared when the the application exited, or a thread was destroyed. This caused font engine references to hang around and never get deleted. Task-number: QTBUG-3976 Reviewed-by: Brad
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-271-2/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed QGLWidget::grabFrameBuffer() to honor the 'withAlpha' value.