summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation of qtconfig without X11Olivier Goffart2011-06-081-2/+9
| | | | Patch-by: Christian Kamm
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-06-0753-1398/+461
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (25 commits) Horizontal lines appearing under entered characters Move qts60plugindeployment rule to correct scope Skipping tst_QEventLoop::processEventsExcludeSocket for qws Fixed compile of tst_qscriptextensionplugin on some Windows configurations QS60Style: Checked state is not shown on highlighted itemview item Removing unused code after introduction of round robin scheduler tst_qeventloop runs the event loop to ensure socket messages arrive Schedule Symbian active objects with a round robin scheduler Fix the build break for QUrl autotest on Symbian Fixed def files for WINSCW Fixed def files for ARMV5 Fix the build break for QStyleSheetStyle autotest on Symbian Fix bug about daylight saving missing on Symbian platfrom. Fix the build break caused by the missing parameter for QSKIP macro. Document the Symbian main window size issue at application start. QS60Style: icon is not shown correctly in a menu item in all cases QS60Style: Remove 3.x specific code from style Fix Coverity issues found from QS60Style Removed qts60plugin references also from config.profiles Remove s60 plugin dll from the iby file too. ...
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-06-061-7/+0
| |\ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Horizontal lines appearing under entered characters
| | * Horizontal lines appearing under entered charactersSami Merila2011-06-061-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here, input context uses text formatting from S60 side, unless native side is indicating that it won't make any changes to the text (i.e. no special formatting). In that case, the input context fetches pre-edit text format from Qt side (dashed underline). Unfortunately, it is only applied to a single character at most and therefore, really easily gets mixed up with "underlined text", which in most cases is the S60 uncommitted predictive text. Task-number: QT-5046 Reviewed-by: Miikka Heikkinen
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-06-061-2/+1
| |\ \ | | |/ | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Move qts60plugindeployment rule to correct scope
| | * Move qts60plugindeployment rule to correct scopeMiikka Heikkinen2011-06-061-2/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-18614 Reviewed-by: TrustMe
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-06-0634-702/+469
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Skipping tst_QEventLoop::processEventsExcludeSocket for qws Fixed compile of tst_qscriptextensionplugin on some Windows configurations QS60Style: Checked state is not shown on highlighted itemview item Removing unused code after introduction of round robin scheduler tst_qeventloop runs the event loop to ensure socket messages arrive Schedule Symbian active objects with a round robin scheduler Fix the build break for QUrl autotest on Symbian Fixed def files for WINSCW Fixed def files for ARMV5 Fix the build break for QStyleSheetStyle autotest on Symbian Fix bug about daylight saving missing on Symbian platfrom. Fix the build break caused by the missing parameter for QSKIP macro. Document the Symbian main window size issue at application start. QS60Style: icon is not shown correctly in a menu item in all cases QS60Style: Remove 3.x specific code from style QDeclarativeDebug: Fix autotest Pass QList as const reference when possible Fixed crashes in Observer mode related to infinite bounding rects Doc QmlDirParser: Fix typeInfo accessor.
| | * Skipping tst_QEventLoop::processEventsExcludeSocket for qwsmread2011-06-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | tst_QEventLoop::processEventsExcludeSocket is failing on qws after an upgrade to that test. It looks most likely to be a qws fault, so a defect QTBUG-19699 has been raised and this test skipped for qws in the meantime. Reviewed-by: Laszlo Agocs
| | * Fixed compile of tst_qscriptextensionplugin on some Windows configurationsRohan McGovern2011-06-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The debug and release versions of staticplugin are qmake'd with the same destination directory. This causes the generated staticplugin .prl file to always refer to the debug versions of Qt libraries, even if Qt was configured with -release. The .prl mechanism is not useful for this test, so simply disable it to solve the problem. Reviewed-by: ckamm
| | * QS60Style: Checked state is not shown on highlighted itemview itemSami Merila2011-06-031-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An itemview item with checkstate and highlight is drawn incorrectly without checked state. Consolidate check state drawing logic to happen into one place to avoid incorrect check states. Task-number: QTBUG-19668 Reviewed-by: Miikka Heikkinen
| | * Removing unused code after introduction of round robin schedulermread2011-06-019-301/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | Existing code that was used to defer active objects and otherwise alter their execution time is unnecessary and unused after the round robin scheduler introduction. So it is being removed here. Task-number: QTBUG-15019 Reviewed-by: Shane Kearns
| | * tst_qeventloop runs the event loop to ensure socket messages arrivemread2011-06-011-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto test tst_qeventloop assumed that socket messages would be received within a single call to processEvents(). But this is not necessarily the case, and in particular with the combination of Symbian round robin active scheduler and new socket engine. So tst_qeventloop now uses an event loop to complete the test rather than just a single call to processEvents(). Task-number: QTBUG-15019 Reviewed-by: brad
| | * Schedule Symbian active objects with a round robin schedulermread2011-06-012-68/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each call to QEventDispatcherSymbian::processEvents allows pre-existing active objects with priority >= CActive::EPriorityStandard to run once. Active objects with lower priorities can only run if no higher priority active object has run. Task-number: QTBUG-15019 Reviewed-by: Tom Sutcliffe Reviewed-by: axis
| | * Fix the build break for QUrl autotest on SymbianDmitry Trofimov2011-06-011-2/+2
| | | | | | | | | | | | | | | | | | This commit fixes the linking problem for QUrl autotest on Symbian Reviewed by: Guoqing Zhang
| | * Fixed def files for WINSCWTomi Vihria2011-06-012-10/+25
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Fixed def files for ARMV5Tomi Vihria2011-05-312-9/+23
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Fix the build break for QStyleSheetStyle autotest on SymbianDmitry Trofimov2011-05-311-0/+5
| | | | | | | | | | | | | | | | | | This commit fixes the build break on Symbian caused by using Motif style which is not supported in Symbian. Reviewed by: Sami Merila
| | * Fix bug about daylight saving missing on Symbian platfrom.Honglei Zhang2011-05-294-26/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Daylight saving support for QDateTime is missing from Symbian platform. This is bug fix for QTBUG-6859. This bug was fixed by commit 2a20705. However, this original fix was removed by 01cf310d2 because of different implementation before S60 5.0 platform. This fix is re-applied since Qt is not going to support S60 3.x platform. Task-number: QTBUG-6859 Reviewed-by: Trust Me
| | * Fix the build break caused by the missing parameter for QSKIP macro.Dmitry Trofimov2011-05-271-1/+1
| | | | | | | | | | | | | | | | | | This commit fixes the build break caused by the missing parameter for QSKIP macro, introduced in commit 05d8caa4c42b5539d993a898830307c21cb942b6. Reviewed by: Guoqing Zhang
| | * Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-05-269-77/+53
| | |\
| | * | Document the Symbian main window size issue at application start.Miikka Heikkinen2011-05-251-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian, application main window will report incorrect size at show event handler because softkeys and status pane are constructed after the show is called. The right place to get the main window size is the the resize event handler. Task-number: QTBUG-19012 Reviewed-by: Laszlo Agocs
| | * | QS60Style: icon is not shown correctly in a menu item in all casesSami Merila2011-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style was using a pixel metric value for the rect, when it has already earlier calculated a correct size rect to use for an itemview item icon. Use the calculated value, as it is correct in all cases (just icon, icon + checkbox, icon + text, icon + checkbox + text). Task-number: QTBUG-19330 Reviewed-by: Miikka Heikkinen
| | * | QS60Style: Remove 3.x specific code from styleSami Merila2011-05-234-196/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove S60 3.x support from QS60Style. Task-number: QTBUG-18615 Reviewed-by: Miikka Heikkinen
| * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-05-238462-141765/+142931
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (225 commits) Fix Coverity issues found from QS60Style Removed qts60plugin references also from config.profiles Fixed compilation. QLibrary: support .so file extension on AIX. Fixed compile of qdrawhelper_neon.cpp. Update qhostinfo autotest to expect RFC5952 formatted ipv6 addresses Fix rendering of Mac controls onto a QImage Symbian socket: Implement systemProxyForQuery for service networks tst_q3dns: update test to follow RFC-5952. Re-apply licenseheader text in source files for qt4.7 Re-apply licenseheader text in source files for qt4.8 Updating file with CRLF line endings for the updated header Updating file with CRLF line endings for the updated header Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII range Fix crashes with regular expressions QtScript on ARM traditional architectures Fix a regression in QList::mid() Fixed bug in meego graphics system runtime switching. Fix thread safety regression of QNetworkConfigurationManager Fix instability in QNetworkConfigurationManager autotest Update licenseheader text in source files for qt4.8 ...
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamSami Merila2011-05-238462-141736/+142916
| | |\ \
| | | * | Removed qts60plugin references also from config.profilesMiikka Heikkinen2011-05-232-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18614 Reviewed-by: TrustMe
| | | * | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-05-238460-141729/+142916
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/s60/src/qcoreapplication_3_1.cpp src/plugins/s60/src/qcoreapplication_3_2.cpp src/plugins/s60/src/qdesktopservices_3_1.cpp src/plugins/s60/src/qdesktopservices_3_2.cpp src/plugins/s60/src/qlocale_3_1.cpp src/plugins/s60/src/qlocale_3_2.cpp
| | * | | | Fix Coverity issues found from QS60StyleSami Merila2011-05-232-29/+15
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are couple uninitialized variables in QS60Style. This also corrects compilation warnings for the class. Reviewed-by: Tomi Vihria
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-05-2027-741/+62
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Remove s60 plugin dll from the iby file too. Remove S60 version plugins Fix QtDeclarative def file for winscw.
| | * | | Remove s60 plugin dll from the iby file too.Laszlo Agocs2011-05-201-4/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
| | * | | Remove S60 version pluginsMiikka Heikkinen2011-05-2025-736/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S60 version plugins serve no purpose now that S60 3.x support has been dropped, so remove them to improve performance. Task-number: QTBUG-18614 Reviewed-by: Janne Koskinen
| | * | | Fix QtDeclarative def file for winscw.Laszlo Agocs2011-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A symbol became absent for some reason, which broke the building of the declarativeobserver plug-in. The ABSENT is now removed. Reviewed-by: TRUSTME
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-05-192-2/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix qguivariant benchmark for Symbian Fix qguimetatype benchmark for Symbian
| | * | | Fix qguivariant benchmark for SymbianMiikka Heikkinen2011-05-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMetaType::QColorGroup requires QT3_SUPPORT, so skip that in builds that do not include QT3_SUPPORT. Task-number: QTBUG-19253 Reviewed-by: TrustMe
| | * | | Fix qguimetatype benchmark for SymbianMiikka Heikkinen2011-05-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMetaType::QColorGroup requires QT3_SUPPORT, so skip that in builds that do not include QT3_SUPPORT. Task-number: QTBUG-19254 Reviewed-by: Sami Merila
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-05-191-3/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Opening taskswitcher, pushes application softkeys to top of switcher
| | * | | Opening taskswitcher, pushes application softkeys to top of switcherSami Merila2011-05-191-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If application does not have active window, do not update CBA, since this causes the CBA to become on foreground. Task-number: QTBUG-19225 Reviewed-by: Miikka Heikkinen
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-06-074-35/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Fix for QTBUG-18947. Changed the macosx deployment target to 10.5 Fixed compile of tst_qscriptextensionplugin on some Windows configurations Re-apply licenseheader text in source files for qt4.8
| * | | | | Fix for QTBUG-18947. Changed the macosx deployment target to 10.5Simo Fält2011-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed by: Eckhart Köppen
| * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-06-0677-1291/+1596
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (46 commits) Fixed compile of tst_qscriptextensionplugin on some Windows configurations drop the SysV semaphores -specific code out from QWSSignalHandler minor refactoring of the QWSLock class simplify the code by using the EINTR_LOOP macro simplify the semaphores initialization minor refactoring of the QLock class add a warning on an incorrect usage of QLock make sure we really clear all locks fix build with QT_NO_QWS_SIGNALHANDLER use a printErr() function instead of std::cerr like in lupdate Re-apply licenseheader text in source files for qt4.8 Fix build in C++0x mode skip the ipv6 Host checking for the moment, since it fails on Windows XP. will fix later Added some of my Qt 4.8 changes to the changelog remove duplicate message Update bearer startup code in network autotests symbian socket engine: share ip address conversion code fix "Host" header of ipv6 URLs in QNAM uic: Use QString::fromUtf8 for QUrl properties. license header check: fix exception for URL TLD table ...
| | * | | | | Fixed compile of tst_qscriptextensionplugin on some Windows configurationsRohan McGovern2011-06-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The debug and release versions of staticplugin are qmake'd with the same destination directory. This causes the generated staticplugin .prl file to always refer to the debug versions of Qt libraries, even if Qt was configured with -release. The .prl mechanism is not useful for this test, so simply disable it to solve the problem. Reviewed-by: ckamm (cherry picked from commit b761f2e1b323012661a9aeed3873b1e5facb0f11)
| | * | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-06-069-242/+204
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-017-239/+201
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: drop the SysV semaphores -specific code out from QWSSignalHandler minor refactoring of the QWSLock class simplify the code by using the EINTR_LOOP macro simplify the semaphores initialization minor refactoring of the QLock class add a warning on an incorrect usage of QLock make sure we really clear all locks fix build with QT_NO_QWS_SIGNALHANDLER use a printErr() function instead of std::cerr like in lupdate
| * | | | | | | drop the SysV semaphores -specific code out from QWSSignalHandlerRitt Konstantin2011-06-014-54/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is safe to call the QLock/QWSLock desctructors instead on normal exit where both lists should be empty; on crash, we don't care about semi-alive objects and the only important thing is to unregister the system semaphores. Merge-request: 1237 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | | | | | | minor refactoring of the QWSLock classRitt Konstantin2011-06-012-68/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unify both constructors in a single one; make the code cleaner and cheaper Merge-request: 1237 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | | | | | | simplify the code by using the EINTR_LOOP macroRitt Konstantin2011-06-011-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the sembuf structure now initializes out of the loop (nano-opt) Merge-request: 1237 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | | | | | | simplify the semaphores initializationRitt Konstantin2011-06-011-17/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there is no need in 3 separate tests since, for local semaphores, semctl(2) always works. if it's not, well, 1 test is completely enough to check that Merge-request: 1237 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | | | | | | minor refactoring of the QLock classRitt Konstantin2011-06-011-82/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use EINTR_LOOP macro to simplify the code; code cleanups; minor optimizations; more informative debug strings Merge-request: 1237 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | | | | | | add a warning on an incorrect usage of QLockRitt Konstantin2011-06-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1237 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | | | | | | make sure we really clear all locksRitt Konstantin2011-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1237 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
generated by cgit v0.12 at 2025-09-23 15:59:28 (GMT)