summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* tests: Mark unstable test as insignificant on WindowsSergio Ahumada2012-03-051-1/+1
| | | | | | | | | | | Marked the following tests insignificant due to failures, these need to be fixed later and then re-enabled: tst_qprocess Task-number: QTQAINFRA-428 Change-Id: Ie7a1e28671f3b7ba709822f724a23aeb70d1ae53 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Harfbuzz-shaper - fix incorrect logClusters being set in HB_OpenTypePositionJohn Tapsell2012-03-041-4/+12
| | | | | | | | | | | | | | After shaping in HB_OpenTypePosition, when we come to calculate the new logClusters array we have to take into account that the glyphs passed in are not a 1 to 1 correspondance with the original string, because some shaping might have already been done. So we must use the old logClusters values (stored in tmpLogClusters) to map from the glyphs passed in back to the original string. This fixes visual word wrapping problems in thai Change-Id: I384dfa98f0946e9e074728f89542acb2b6b6bc27 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QSslCertificate - make lazy initialisation thread safeShane Kearns2012-03-041-1/+62
| | | | | | | | | | | | | | | | | | | QSslCertificate can be copied around into multiple threads, without detaching. For example, the https worker threads inside QNetworkAccessManager. There are const methods, which lazily initialise members of the private class without detaching (i.e. caching results of expensive function calls) These functions now lock the d pointer using QMutexPool to avoid concurrency related crashes. autotest crashes 20% of the time in release builds without the fix, passes 100 times in a row with the fix. Task-number: QTBUG-20452 Change-Id: I64a01af8159216f2dd6215a08669890f6c029ca8 (cherry picked from commit 55bf4ed9468ad467a0b681d2d041edbc2a5a4d21) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Re-enabled passing tests in tst_qvariantJo Asplin2012-03-012-2/+3
| | | | | | | | | | | | | To increase the effective test coverage, this patch re-enables the tst_qvariant test case as such, and instead disables only the test functions that are currently failing in CI. Task-number: QTBUG-22453 Change-Id: Ibf0dc3caf50d34084fa50cf76d199e77a42f6e16 Reviewed-by: Olivier Goffart <ogoffart@kde.org> (cherry picked from commit e142a64a33a54c433a38d330d64292b7e7698c92) Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add additional QGraphicsView tests for regressionJonathan Liu2012-02-281-0/+61
| | | | | | | | | | Add additional tests for graphics view tooltip regression introduced by 7c0d15a22266a425c9e9ac0120d6774e120fe01e. Task-number: QTBUG-17517 Task-number: QTBUG-22663 Change-Id: I5e0d0e19504730a3e14ac84712a366dbebe688e6 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Specify global mouse position for QDeclarativeMouseArea auto testJonathan Liu2012-02-281-3/+4
| | | | | | | | | | The preventContextMenu QDeclarativeMouseArea auto test creates QContextMenuEvent without specifying the global mouse position. As a result, the event's global mouse position is incorrectly set to QCursor::pos(). Change-Id: Ib67fbcf3acf968eb2748426ad0db0e900826b232 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* test: Improved stability of tst_qsharedmemorySergio Ahumada2012-02-281-2/+2
| | | | | | | Significantly increase waitForFinished() timeouts. Change-Id: I498408c756f2b46bf3870f40703e7c2f0d4ec9b5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix tst-qtextscriptengine unit test when no appropriate font existsJohn Tapsell2012-02-241-0/+4
| | | | | | | | The tst_QTextScriptEngine::controlInSyllable_qtbug14204 test fails if no Devanagari font is found. Change-Id: I35cf9d788569a92daa8b370480a44f7e748ddf86 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Stabilize tst_qdbusabstractinterface and make it XFAILRohan McGovern2012-02-231-40/+40
| | | | | | | | | | | | | | | | | | This test was written incorrectly in a way which happened to allow it to pass most of the time (but not all the time). Reset the state of test objects between each test function, and mark the broken functions with QEXPECT_FAIL and a link to a task. Replace the unusual WaitForPinger construct with the usual QTRY_VERIFY/QTRY_COMPARE method of verifying asynchronous operations. (cherry picked from commit e88f9a92b7ab05ea9bc25083de7dee1b67dd673e) Task-number: QTBUG-24262 Change-Id: I7a1f265695c15c0f7b1867a8608827c951a6e3b9 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix handling of urls containing username/password in QNetworkAccessManagerShane Kearns2012-02-201-10/+53
| | | | | | | | | | | | | | | | | | | QNetworkAccessManager was ignoring the supplied credentials, although webkit seems to support these urls at a higher level. Following the behaviour of browsers: We use supplied credentials if authentication is required. We add supplied credentials to the authentication cache. We emit authenticationRequired signal if the credentials were wrong. We do not use previously cached credentials for that url Synchronous http requests fail, if the credentials were wrong. Task-number: QTBUG-18107 Change-Id: If46e8eab1511ba8a0f4bbe0d4efaabc4df0b8ab4 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit b4a538ea1c3cdce09e3528227dba2e8f5765cbdc)
* tests: Mark unstable tests as insignificant on WindowsSergio Ahumada2012-02-173-2/+2
| | | | | | | | | | | | Marked the following tests insignificant due to failures, these need to be fixed later and then re-enabled: tst_qlocalsocket tst_selftests Task-number: QTQAINFRA-428 Change-Id: I294048133bac141dfd6239dba115dcc93035f868 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Abort FTP download, not the whole applicationShane Kearns2012-02-151-0/+24
| | | | | | | | | | An old coding error meant that the C runtime abort() function was being called instead of QFtp::abort() when cancelling an FTP download using QNetworkReply::close() Task-number: QTBUG-22820 Change-Id: Ib97fda9769b2b55a08c042c66c4444cb6216d2b1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix online status checking in generic bearer plugin.Xizhi Zhu2012-02-152-0/+97
| | | | | | | | | | | | | QNetworkInterface::IsUp means the interface is up, but not necessarily connected. QNetworkInterface::IsRunning means the interface is up and connected. Cherry-picked from Qt5 / QtBase commit: c93ac6758606f64af7fe2bac6c8bb08391d218a7 Task-number: QTBUG-22873 Change-Id: Ieb544058814520b4292b496de2e4672214f3d00a Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* tests: Mark unstable tests as insignificant on WindowsSergio Ahumada2012-02-153-0/+6
| | | | | | | | | | | | | Marked the following tests insignificant due to failures, these need to be fixed later and then re-enabled: tst_qlocale tst_quuid tst_uic3 Task-number: QTQAINFRA-428 Change-Id: I21e78e4320e28735286778125a103caf7aa45d44 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Checking for directory exists in failed QDir::mkpath on SymbianMurray Read2012-02-151-0/+6
| | | | | | | | | | | | | | QDir::mkpath should return true if the directory already exists. In the new native Symbian implementation, RFs returns KErrPermission denied when you try to access some data caged directories such as C:\private. This was being interpreted as failure, as the code expected KErrAlreadyExists for the case where the directory exists. In this circumstance we now check if the directory already exists. Task-number: ou1cimx1#974477 Change-Id: Ie476219bc963c23d3c7e1773ebded8ecf137fd3c Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* tests: Mark unstable tests as insignificant on WindowsSergio Ahumada2012-02-147-4/+7
| | | | | | | | | | | | | | | | | Marked the following tests insignificant due to failures, these need to be fixed later and then re-enabled: tst_qdeclarativeerror tst_lupdate tst_qfile tst_qlibrary tst_qtcpserver tst_qxmlquery Task-number: QTQAINFRA-428 Change-Id: I648f86b3ec7767f83767af8981a6ce2aed65722b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Re-enabled tst_LargeFileJo Asplin2012-02-142-1/+3
| | | | | | | | | | | | tst_LargeFile currently seems to pass in a stable way in CI It does have an issue on 64-bit Linux (see QTBUG-21175), so that test function is still disabled (QEXPECT_FAIL'ed) on that platform. Change-Id: I818046f84f2db5eb2155ae1f51f69581029bfaee Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> (cherry picked from commit b5ef53df457d784da7221a8244963462a686458d)
* test: Do not mark tst_qdeclarativeerror as insignificant anymoreSergio Ahumada2012-02-131-2/+0
| | | | | | | This test has been stable for quite some time now. Change-Id: I97157c4ccc8221d2ff9f54ee7ed4c66b50956c01 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Added QAccessibleGroupBoxJosé Millán Soto2012-02-101-0/+45
| | | | | | | | | | | | Added a new accessible interface for QGroupBox, as QAccessibleDisplay is not good enough when the QGroupBox is checkable. AccessibleFactory was modified to return a QAccessibleGroupBox when the accessible interface of a QGroupBox is requested. Created tst_QAccessibility::groupBoxTest Change-Id: I6c23dcf5562b3ea269b04102e78463b65827188a Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* test: Do not mark tst_qdeclarativetimer as insignificant anymoreSergio Ahumada2012-02-101-2/+0
| | | | | | | This test has been stable for quite some time now. Change-Id: I485ad4c904db758fa4e594ba0cd883fbe964e525 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* test: Do not mark tst_uic3 as insignificant anymoreSergio Ahumada2012-02-101-2/+0
| | | | | | | This test has been stable for quite some time now. Change-Id: I0a45af35abb263dc4ee9bcab519fda5b313446df Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* test: Mark tst_QMdiSubWindow with insignificant_test on Mac OS XSergio Ahumada2012-02-101-1/+1
| | | | | | | This test only fails on Mac, so enforcing it on Linux. Change-Id: I417a6b4fa76d267232f44009c5b8d2622cbe2f7c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* test: Re-enabled passing test in tst_qdbuspendingcallSergio Ahumada2012-02-101-2/+0
| | | | | | | | | tst_QDBusPendingCall::watcher_waitForFinished_threaded() autotest was fixed by 42004eccf246cbc110f0ad22caa85efeeeb640bb Task-number: QTBUG-20859 Change-Id: Iad3c735e07b3ef21796c3aab1211e18e621ca4d3 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* QTextEngine - treat a fullstop (0x2E) as the same script as the preceeding ↵John Tapsell2012-02-101-6/+43
| | | | | | | | | | | text when dividing up strings Many languages use a fullstop to indicate an abbreviation, making the fullstop part of the word. For languages like thai, it is required to pass the fullstop along for correct word breaking. Change-Id: Ideded63432d06a1ab3b786a7bd13356f2cc1a090 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Harfbuzz-thai: Hide ZWJ and ZWNJ characters and show Inherited charactersJohn Tapsell2012-02-101-0/+42
| | | | | | | | | | | | | | | | | | | | | | Thai is not supposed to have ZWJ and ZWNJ characters or any other of the Inherited Unicode Scripts (http://www.verisigninc.com/assets/idn-inherited-unicode-script.pdf) - they don't have a mapping to the thai encoding tis620 which libthai requires. However it is an unfortunate fact that there are many websites etc that liberally place these ZWJ and ZWNJ characters throughout thai text to force word boundaries, so we must also deal with them. We deal with all Inherited characters by mapping them to the invalid code ~0 in tis620 encoding, following what libthai does internally in its own tis620 encoding functions, and then replacing this character with the original unicode and setting dontPrint to true to hide the ZWJ and ZWNJ characters. Includes a unit test to check the behaviour. Change-Id: I49e44da6e39443daa832e7f50c94804e13deabb4 Reviewed-by: Adrian Yanes <ext-adrian.yanes@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix unstable test due to a race in QThreadBradley T. Hughes2012-02-091-1/+1
| | | | | | | | | | | | | | QThread::finished() is emitted before setting the thread's state to finished and !running, which means it's possible to receive the finished() signal and act on it while QThread::isRunning() still returns true. This test randomly fails due to this race. Fix it by using checking the return value of QThread::wait() instead. Change-Id: Ibf347fc9a2e8d32b328227ee6978e1129dd781f4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit faa6113c41b81368c5bbc2a764c2ae9bbc42e415)
* Fix QListView::scrollTo() when there are hidden rowsJani Honkonen2012-02-091-0/+47
| | | | | | | | | | | | | | QListView does not consider hidden rows when scrolling to an item. If there are hidden rows (or columns) before the selected item then the visual index of an item is not the same as the row index from the model. So scrolling will be off by the number of hidden rows before the selected item. Added a autotest for this also. Task-number: QTBUG-21115 Change-Id: I49c39033d83f80d4405b59510617096029ee6d3b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Avoiding early deleteLater in Symbian with better loopLevel trackingMurray Read2012-02-091-0/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | There have been a number of app crashes where deleteLater has been triggering too early, causing an object to be deleted before it has been finished with. This was happening when deleteLater was issued then Symbian's active scheduler loop was nested. Qt keeps track of loop nesting level to implement deleteLater correctly, but it was only tracking the event loop in processEvents and QEventLoop correctly. The wakeup and timer active objects were assuming they were always run from processEvents and its round robin active scheduler and were adjusting the loop level to account for this. However if they happened to run in another event loop, eg the active scheduler, the loop level adjustment meant that it looked like the event loop was re-running at the same level, which allowed deleteLater to act. The fix is to mark active objects as being run from the RR scheduler, then the wakeup and timer active objects can be tested to see which type of scheduler they are actually running in. With this knowledge, the correct loop level adjustment can be made, and deleteLater runs at the correct time. Task-number: ou1cimx1#947013 Change-Id: Id05cd63ad10e100ea807cc276844aaa36c614351 Reviewed-by: Gareth Stockwell <ext-gareth.stockwell@nokia.com> Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Change bugreports.qt.nokia.com -> bugreports.qt-project.orgSergio Ahumada2012-02-094-6/+6
| | | | | | Change-Id: Ib13737eac7f7cee3ebca44aa712cb6b152672a81 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* tests: Don't mark qcopchannel and qdirectpainter subtests as testcases.Sergio Ahumada2012-02-082-3/+0
| | | | | | | | | The subtests are intended to be executed by tst_qcopchannel/tst_qdirectpainter and therefore don't need to have "CONFIG += testcase", which causes 'make check' to treat them as stand-alone tests. Change-Id: I3461275f5e32f1fa8836f17d0e9e6d0780dd81e5 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Improved stability of tst_networkselftestRohan McGovern2012-02-081-12/+12
| | | | | | | Significantly increase most timeouts. Change-Id: I3c25692d1e26ae3efd301df2f02089e57a8708d3 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Handling adopted thread death with active timers on SymbianMurray Read2012-02-081-0/+27
| | | | | | | | | | | | | | Timers are thread local objects on Symbian. When the adopted thread monitor tries to tidy up a thread, any existing qt timers will be cleaned up. But that has to be done very carefully without touching the underlying symbian timer objects. Checks are added to make sure the Symbian timers are only touched in the correct thread. Task-number: ou1cimx1#960478 Change-Id: If16750b455aa576aa9f2d93657a3627d18060272 Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Make QString::latin1() re-entrant, the global QHash needs a mutex.David Faure2012-02-082-0/+21
| | | | | | | | | | *Different* instances of QString used in different threads would often lead to crashes due to the global QHash used by latin1() and ascii(). Basic autotest for latin1() added. Change-Id: If4fd450deb28f41b1d71f377cacb8815ddeffbee Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* test: improved stability of tst_qiodevice on slow machinesRohan McGovern2012-02-071-4/+4
| | | | | | | | | | | Increased network timeout from 5 to 30 seconds. Change-Id: I4751dbfbb82c2091f1cec26150f06f913ffbe4c0 Reviewed-on: http://codereview.qt.nokia.com/2456 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com> (cherry picked from commit 493634a71190679666082687626c05047b5cd463) Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Improved stability of tst_qsemaphore (especially on mac)Rohan McGovern2012-02-071-14/+26
| | | | | | | | | | | | | | | | Timers are not entirely precise; if we ask for a timeout of 10000 milliseconds, we might time out in 9999 instead. Also, we know the expected elapsed time in each case, so do a fuzzy comparison against that time. Previously the test was verifying that the elapsed time was greater than or equal to the timeout in the case where a timeout was expected, which means the test would not detect bugs which incorrectly caused the timeout to occur later than it should. Change-Id: Ic054013c7d53af8a87a89e9d9c4acbce68ba575e Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Improved stability of tst_qhttpsocketengineRohan McGovern2012-02-071-7/+7
| | | | | | | | | | | | This autotest assumed that various network operations could always be completed within 5 seconds. Notably, it assumed that an attempt to resolve a nonexistent hostname would always result in an error within 5 seconds. In my testing, it usually takes 4-6 seconds to complete, but occasionally takes as much as 13 seconds. Change-Id: Ia31bb86495928633159f3527763aad086635e7e4 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* tests: allow unstable tests to be marked with CONFIG+=insignificant_testSergio Ahumada2012-02-074-1/+6
| | | | | | | | | | Marking a test with CONFIG+=insignificant_test will cause the exit code of the test to be discarded during `make check'. This is intended to be used for tests which are valuable to run, but are known to be unstable and are not feasible to immediately fix. Change-Id: Ie3afe664e3a91c2d1f9ca03c2f39f8f9c5aa6edc Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed QtDeclarative autotest deployment for WinCE devices.jaanttil2012-02-0661-61/+134
| | | | | | Change-Id: Id42aefd69484d5cfe1f44566dffce4b05db5aa19 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix 3 autotest build faulures for WinCEjaanttil2012-02-063-1/+4
| | | | | | | Change-Id: I67af7b1b31be3c6d99abf2344bcfd93fd5f77bf6 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Make copy and cut methods work in QAccessibleTextEditJosé Millán Soto2012-02-061-0/+6
| | | | | | | | Correct the implementation of cutText and copyText in QAccessibleTextEdit so they use cut() and copy() methods of QTextEdit Change-Id: I86a531ed7059b1a928cb8515c2743d4d8b596b36 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Do not check isActiveWindow to determine if an accessible widget is focusableJosé Millán Soto2012-02-061-2/+2
| | | | | | | | | QWidget::isActiveWindow() was being checked in QAccessibleWidget::state to determine if a widget is focusable. As a result, focusable widgets were reported to be not focusable when the window was not active. Change-Id: I765eddca859d859d19d31bd2e9ffe3b132a1a4ef Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* test: fix tst_QFile::rename() autotestSergio Ahumada2012-02-031-1/+1
| | | | | | | | | This test was incorrectly assuming that a file named "Makefile" exists. Change-Id: I318b12f67e0476d6f08d1fc86194ca96f2bdb373 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> (cherry picked from commit 227cb8c0b91f9e88e53432b3936cd1fc4f90e9f7) Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Fixed qchar and qsvgrenderer autotest deployment for WinCE devices.jaanttil2012-02-032-2/+7
| | | | | | Change-Id: Ibac9f5878ea1ec2a7d13868e5e60f1d6e7aa3d36 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QTextEdit cursor position fix when moving left/right with selectionPasi Matilainen2012-02-032-4/+4
| | | | | | | | | | | When text has been selected in a QTextEdit and the left or right arrow key is pressed, the cursor moves one character beyond the start or end of the selection, when it shouldn't move past the selection. Fixed by moving the cursor to the right place when a selection is active. Task-number: QTBUG-22853 Change-Id: I9ea1863436db98627a6fd041ce554cf10be26493 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* test: Split `qsqlquery' unit and benchmark testSergio Ahumada2012-02-037-38/+290
| | | | | | | | | | | | Moving benchmark test from 'tests/auto' to 'tests/benchmarks'. Also removing 'qttest_p4' usage while we are at it. - void benchmark(); was moved to 'tests/benchmarks/sql/kernel/qsqlquery' Change-Id: Icbe88fecdfe24a7754079451f635f9c19b3d6683 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* test: Split `qcontiguouscache' unit and benchmark testsSergio Ahumada2012-02-035-138/+197
| | | | | | | | | | | | | | Moving three benchmark tests from 'tests/auto' to 'tests/benchmarks'. Also removing 'qttest_p4' usage while we are at it. - void asScrollingList(); - void cacheBenchmark(); - void contiguousCacheBenchmark(); were moved to 'tests/benchmarks/corelib/tools/qcontiguouscache' Change-Id: Ie6ca7f55db2a218f3ccf699744cb721a8a1e2363 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Change QUrl::toLocalFile to return path for relative urlsAapo Haapanen2012-02-021-3/+5
| | | | | | | | | | | | | | | | | | This change reverts the behaviour of QUrl::toLocalFile to the state it was before 4.8. After this change the function returns the path if the url is relative. Before this change an empty QString was returned. A relative url can refer to a local file, but that can't be determined from the url alone. Thus, it makes sense to return the path for such urls. Added documentation to explain that the function works like this to maintain backward compatability in 4.x, but the handling of relative URLs will change in 5.0. Task-number: QTBUG-19827 Change-Id: I8bb8f4603a5936c0359afc1b6ff98824fad6cbc9 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Skip tst_QEventLoop::deliverInDefinedOrder_QTBUG19637 on SymbianGareth Stockwell2012-02-011-0/+3
| | | | | | | | | | Temporary workaround for QTBUG-23974. This change allows the test suite to run to completion, and is required in order to allow some new test steps, prepared for addition following this change, to be executed. Change-Id: I96c9d8e76646625deb69143a434ed9a186623c72 Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Fix crash in QTreeWidgetItem::sortChildren when adding new item.Markku Heikkila2012-02-011-0/+32
| | | | | | | | | | | | | | | | Recursive call is caused if user code calls QtreeWidgetItem()::sortChildren and sorting is enbled in QTreeWidget. First call is from user code and second is caused by timer. When timer expires second call is made. This recursion is prevented with QTreeModel::SkipSorting skipSorting() in QTreeWidgetItem::sortChildren(); Task-number: QTBUG-20345 Change-Id: I48af98b03c0291de8da90d1581bc55cc89846b8c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix exception handling in Symbian event dispatcherMurray Read2012-01-261-0/+10
| | | | | | | | | | | | The Symbian event dispatcher handles exceptions from active objects as well as leaves. But if the active object throws while it has something pushed on the cleanup stack, the exception must be converted to a leave for the cleanup to happen and the cleanup stack balance to be maintained. Task-number: ou1cimx1#970701 Change-Id: I6c8eed61cb1666e36eb4858a2c72ad0d8c6b0c8f Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>