summaryrefslogtreecommitdiffstats
path: root/tests/auto
Commit message (Collapse)AuthorAgeFilesLines
* skip flaky tst_QLocalSocket::threadedConnection on WindowsJoerg Bornemann2012-11-021-0/+4
| | | | | | | | | | | Make sure that we run at least the non-flaky QLocalSocket tests. Task-number: QTBUG-27816 Task-number: QTQAINFRA-574 Change-Id: I38bb0111248ff71dc8679e81ca418f9e2f7b98e3 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* tst_qdeclarativepixmapcache: Remove CONFIG+=parallel_test and mark test as ↵Sergio Ahumada2012-11-021-2/+1
| | | | | | | | | insignificant Task-number: QTQAINFRA-574 Change-Id: Ib6df20784c12104a2f2a46ec4a7842e3af17271b Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Rohan McGovern <rohan@mcgovern.id.au>
* test: Mark tst_qhttpnetworkconnection as insignificantSergio Ahumada2012-11-021-0/+2
| | | | | | | Task-number: QTQAINFRA-574 Change-Id: I7d52efc8dc8a5a24d9269b12b48ea2d5583c3c6c Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Rohan McGovern <rohan@mcgovern.id.au>
* correct spelling in commentMark Brand2012-10-311-1/+1
| | | | | | | Change-Id: I6ffa96ac9cda0701c99f839804f400a167fcf9a7 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> (cherry picked from qt5/qtbase commit 9b710bc13b9f8d8cf163d14d1f6e741e7851b06e) Reviewed-by: David Faure <david.faure@kdab.com>
* Fix QDBusServer with more than one connectionJan Arne Petersen2012-10-311-9/+29
| | | | | | | | | | | | | | | | Create a new QDBusConnectionPrivate for every new connection in qDBusNewConnection instead of creating a single QDBusConnectionPrivate in the QDBusServer constructor which gets assigned the latest connected DBusConnection in qDBusNewConnection (and loses track on all previous DBusConnections). Also extend tst_QDBusConnection::registerObjectPeer() test with multiple connections to the server. Task-Number: QTBUG-24921 Change-Id: I4341e8d48d464f3fe0a314a6ab14f848545d65a0 (cherry picked from qtbase/a386194f9952683c0be5028f2b7f0ce9617fe404) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix a crash in QFileDialog when selecting an invalid name filter.Friedemann Kleint2012-10-311-2/+47
| | | | | | | | | | | | When nameDetailsVisible is set to false and an invalid/empty string is passed to selectNameFilter(), the regexp used to strip the filter off the suffixes returns empty and a crash occurs. Change-Id: I926ea49514ff25a103977d8121fca1cf83d647f5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from qtbase/d0aa81ee104107db1ce41a9bf0f91d4cb144f7de)
* Make the examples test for QtDeclarative pass.Friedemann Kleint2012-10-312-33/+55
| | | | | | | | | | | | | | | | | | | | | | | | - Fix check to indicate immediate errors, skip the loading state (using QTRY_VERIFY from shared/utils.h) and check for errors after loading again. - Exclude all broken examples. - Exclude shaders if import path is missing or OpenGL is not present. - Exclude Mac .app folders - Fix the DeclarativeViewer to check for the presence of the ImageMagick and ffmpeg executables only once, reducing test time. - Do not check for ImageMagick by running its command line tool 'convert' on Windows, since Windows has a tool of the same name that converts file systems (!). - Fix doc snippets to load correctly. Task-number: QTQAINFRA-428 Change-Id: Icc0a983bc42857b41ab1d9e93336f8265bfbec36 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Christopher Adams <chris.adams@qinetic.com.au>
* QHeaderView - fix minor bug in visualIndexAtThorbjørn Lund Martsum2012-10-311-0/+13
| | | | | | | | | | | | This fixes a minor bug in VisualIndex triggered when calling resizeSection with size 0 (but not hideSection). It is mostly cosmetics - but it is still a bug. This is a backport of SHA 73a5bc2aac7638438dfde260a4246359a06e89ae Change-Id: Ic3e1ce584d8befa501c670c085435248ebaa681b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QHeaderView - length returns wrong value fixThorbjørn Lund Martsum2012-10-311-0/+18
| | | | | | | | | | | | | | | | | | | | | | setSectionHidden called with (logindex, true) will sometimes not do a (correct) call to resizeSection(logicalIndex, 0) at once. However it does execute d->doDelayedResizeSections(). Therefore the section is going to be hidden later. However it is a problem that the length meanwhile is wrong. (That is a value that is not the sum of the sections) This is fixed by execute updates before returning the length. This is a backport of SHA 125016ad241125176e5bebab94eebcf50fac20bc Task-number: QTBUG-14242 Change-Id: Ia1d2f6db3213792b250a6a37942b56554261cd3a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QNX: Use inotify on QNX systems that support itThomas McGuire2012-10-301-0/+8
| | | | | | | | This is a backport of qtbase commit fc0cbef59599174589a606838a9b55ba6a07ef06 Change-Id: I27ca7222ed0e622bdae405f0802ab29e22f4cbbf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix Qt network autotests against updated autotest server.Janne Anttila2012-10-301-64/+7
| | | | | | | | | | | | There is an updated version of Cyrus server available in Ubuntu 10.04 repositories. Installing autotest server now with puppet configs, results updated Cyrus server to be installed and "greetings" line it provides is not compatible with Qt 4.8 autotests. Use functions from qtbase, they don't require exact version of Cyrus. Change-Id: I4fd2f14ca9d51a992c129d2fcd9a6cc85fa10a1b Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix tst_qhostinfo test case for Digia CI infra.Janne Anttila2012-10-301-2/+2
| | | | | | | | | | | | | | | Microsoft DNS server used in Digia hosted Qt-Project CI system, returns 'Server failed' error for hostname ending with dot. Because the purpose of this autotests is to test 'notfound' use case, it should is ok to use also 'invalid.invalid' hostname in these DNS queries. The similar chang in Qt5: https://codereview.qt-project.org/36871 In addition 62.70.27.69 IP address is not mapped to trolltech.com anymore. Update test to use qt-project name and IP instead. Change-Id: I11b0233109a6dc8b3de8e9783a287ce106436711 Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix tst_qhttp autotest after Digia acquisition of Qt business.Janne Anttila2012-10-301-4/+4
| | | | | | | | | | | The autotest expected that qt.nokia.com would respond with "200 OK", but it currently responds with "301 Moved Permanently". Changed test case to use qt-test-server instead of qt.nokia.com. Because qt-test-server does not have developer subpage, changed PCT test case to use simple.html instead. Change-Id: I13430a1d79568a46085f53de49b50989a4fdc144 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Mark flaky tst_qlocalsocket autotest insignificant.Janne Anttila2012-10-301-0/+2
| | | | | Change-Id: I415c57aaf3454a9a40adc1dc51977386bada163a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* tst_qaccessibility: narrow QEXPECT_FAIL in textEditTestRohan McGovern2012-10-302-1/+3
| | | | | | | | | | | tst_QAccessibility::textEditTest no longer fails on Ubuntu 10.04 in CI. Restrict the QEXPECT_FAIL to only those platforms where it is known to fail. Task-number: QTBUG-26499 Change-Id: Ia12e81dbc0a94464c9916bedb4d29065781285c5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fix tst_qsslsocket auto test build when OpenSSL is not available.Janne Anttila2012-10-301-0/+2
| | | | | | | | | This is needed to get Qt 4.8 CI passing. OpenSSL is apparently missing from Digia hosted Windows CI machines. OpenSSL to CI Testers will be installed later on to cover also these code paths. Change-Id: I6a4e2b4b1fa6c56692f112f1c5fc47361cb1ea0c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Marking networkselftest, qthread and qxmlquery insignificant temporarily.Janne Anttila2012-10-303-0/+6
| | | | | | | | | | | | | | | | | | | | | | These tests failed on latest Digia hosted Qt 4.8 CI builds (919 and 921), marking them temporarily insignificant to get CI passing. See task: QTQAINFRA-574 tst_networkselftest failed because there is no OpenSSL installed on CI devices. This will be fixed as soon as I have access to VMs and they are free from builds. tst_qthread and tst_qxmlquery timed out after default 450 seconds, I need to check how long these test take to complete in our environment to increase timeouts or is it actually so that execution of these tests freeze for some reason. I'm marking these insignificant for all platform for now, since I don't yet have test results from Macs. It might be that some of these tests fails also there. Change-Id: Ic6d7fb1b3c7951ff98c4fa84028450f0b2ba13fa Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Mark qsharedmemory insignificant since it is flaky.Janne Anttila2012-10-301-1/+1
| | | | | | | To be resolved after 4.8 CI is passing. Change-Id: Ic3def05f5cd538c19affea1dcec1f20df6cc1e3b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Use the right properties when checking the frame's marginsAndy Shaw2012-10-221-0/+19
| | | | | | | | | | Changed it to check the Frame*Margin property instead of the Block*Margin property as this was incorrect for a QTextFrameFormat. Task-number: QTBUG-22173 Change-Id: I2c3066165fb592ed034874b1180593822859f933 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> (cherry picked from qtbase/d060620e6cd3c94e7e0ff809b21593b9c0da0be2)
* Add a QNX 'quirk' to platformquirks.hNick Ratelle2012-10-201-0/+2
| | | | | | | | | | | | This patch is not needed by Qt5, since the code in question no longer exists. Change-Id: Iabda3ed35ff7adc4af0e6e189fd04dee12a04431 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Nick Ratelle <nratelle@qnx.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Do not skip tst_QClipboard::copy_exit_paste on QNXRafael Roquetto2012-10-171-1/+1
| | | | | | | | | | This test is valid on QNX platforms cherry-picked from qt5 703fa6c361682cab0d64baabd9256c651da34779 Change-Id: I51c1d191cf8cdbde6239afc99019ca310bd2220a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fixed cosmetic line drawing where begin and end points are equal.Samuel Rødal2012-10-171-0/+21
| | | | | | | | | | | This case has typically required specific work-arounds in other rendering paths as well. (cherry picked from commit dfb55f8a6c8d3ec4da840191c331ace3c2aa2bf3) Task-number: QTBUG-25153 Change-Id: I217e710a30222792ebca3bf297e438d944c32992 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QComboBox: replace homebrew with QSignalSpy for editTextChanged testMark Brand2012-10-171-35/+12
| | | | | | Change-Id: Id4c81ae71d6dc87f9ad7cfb99a89d335162e1f75 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> (cherry picked from qt5/qtbase commit e437051ff51d57bcc6937dc23fe6a77bf9897130)
* Properly define SRCDIR for QNX on tst_QDirRafael Roquetto2012-10-131-1/+1
| | | | | | | This change is not required by Qt5. Change-Id: I8b6ea3fcd1c879ee7e74bb304ef27d090d53e6e5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* tst_qfiledialog: fixed typo causing semi-random completer() failureRohan McGovern2012-10-121-1/+1
| | | | | | | | | | | | | | | | completer_data() was attempting to find the first folder which did not begin with a '.' character under QDir::root() for usage during the test. However, a typo caused it to find the first folder even if it _did_ begin with a '.'; unless the first folder returned by entryList() was ".", in which case no folder would be found. (cherry picked from qtbase commit 0776746d47c9b0d575b6190b1882c571a76ee086) Change-Id: I1d98afa071ea4300e4e2f0aa324e8c1fd8a0728e Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* QDeclarativeTrace patch for a custom trace instanceFrantisek Vacek2012-10-122-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for the BB10 Cascades profiling. There are more reasons for introducing this patch: 1) Cascades do not use QtGui library for QML rendering. It has its own paint engine with client-server architecture. Profiler traces are sent asynchronously from non Qt renderer thread to the Qt client. The QPerformanceTimer has to be patched too, cause we need to know time difference between tracing zero time and some time in past, see: qint64 elapsedToAbsoluteTime(qint64 absoluteMonotonicTimeNs) const 2) Since we need more sophisticated trace engine in cascades, this patch allows explicitly assign custom class derived from QDeclaraqtiveDebugtrace to the trace framework. If no custom instance is assigned, the default QDeclarativeDebugTrace instance is created implicitly on first trace request. Using custom trace instance which is not part of Qt (it is part of libbbcascades) allows us to implement all Cascades trace special needs in libbbcascades and not to carry Qt with the platform specific code. 3) The NO_CUSTOM_DECLARATIVE_DEBUG_TRACE_INSTANCE macro is introduced to allow custom trace engine only on the bleckberry platform, see declarative.pro. If this macro is defined Qt compiles from its original code. 4) Possibility of custom QDeclaraqtiveDebugTrace instance might be usable for other projects which needs to extends somehow default Qt trace functionality. 5) Patch is not intended to be applied to Qt Quick 2, since declarative debugging infrastructure is changed there. (cherry picked from commit f13b52f25c1e0bc26dcf3ea304b3495f7d5cd370) Change-Id: I199211c1de66e930e252e8c033503d7f4940565f Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* In tst_qdeclarativenotifier, verify the result of QObject::receivers()Thomas McGuire2012-10-121-0/+26
| | | | | | | | This is a backport of qtdeclarative commit 581c57125368eb6ef0b853e037649cf0c1a8bc80 Change-Id: Iab31f106b83958a62d9fcbb53fc1daf6931d3257 Reviewed-by: Alan Alpert <416365416c@gmail.com>
* Fix QObject::receivers() within connectNotify()Thomas McGuire2012-10-121-0/+2
| | | | | | | | | | | | The receiver count needs to be correct in connectNotify() to be compatible with ordinary connections. Fix this and add test. This is a backport of qtdeclarative commit b1c6e095404ccb7788e6b12fff692c71f4900815 Change-Id: Ic3145a536c928eccfcc29b4d010a526135b654b0 Reviewed-by: Alan Alpert <416365416c@gmail.com>
* Fix the guiapplauncher test.Friedemann Kleint2012-10-122-59/+80
| | | | | | | | | | | | The test historically relied on obscure environment variables to determine whether the examples, demos should be run. Remove that code and check whether the executables exist. In the Window manager code, no longer exclude WS_POPUP windows, which seems to fail with the current Qt 4.8. Task-number: QTQAINFRA-428 Change-Id: I88d2be085cb543effc800115885e8ff86a1cf7ba Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Changed Qt release version to 4.8.4jutaipal2012-10-086-6/+6
| | | | | | | Change-Id: I45f7894f7e79617b6ccb8caa464bbbffaf9dd7b5 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix error when inserting to tables with datetime fields with QODBCThiago A. Correa2012-10-081-1/+27
| | | | | | | | | | | | | | SQL Server 10 introduced stricter rules for TIMESTAMP validation, making it necessary to specify the decimal digits. Other databases might do the same as well, so this patch introduces a check for the TIMESTAMP column size and adjusts the decimal digits parameter as needed. Task-number: QTBUG-2192 Change-Id: If6d798c6c928ebda75bc474e49a07fbbfbe5816c Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry picked from qtbase/b8b79a0f37ec74fd5b4ad829e522a384ba3622ae)
* Enable tst_qfocusevent.cpp.Friedemann Kleint2012-10-022-5/+7
| | | | | | | | | | Replace qWait() by qWaitForWindowShown(). Add QEXPECT_FAIL on Mac for tst_QFocusEvent::checkReason_Popup and tst_QFocusEvent::checkReason_ActiveWindow. Task-number: QTQAINFRA-428 Change-Id: If172085850ac1bd7cf6187b0e767b60fe46be934 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix autotests that no longer find executables on Windows.Friedemann Kleint2012-10-023-7/+60
| | | | | | | | | | | | The tests are now run from the 'debug', 'release' subdirectories on Windows by 'make check'. Go up one directory so that the relative paths are correct. Network tests only. Task-number: QTQAINFRA-428 Change-Id: I03bc04028b405bc4f897cbf9d7cb400cc009bb8f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update the state of native menus correctly on MacPasi Matilainen2012-10-024-0/+210
| | | | | | | | | | | | | | | | | | | | | The state of native menus is currently updated in two incompatible ways on Mac, either by updating the state of native menu items in a native menu (when setEnabled is called) or the state of the native menu item containing the native menu (when the menus are initialized and when a modal dialog is opened/closed). This causes various problems, e.g. inability to enable a menu that was disabled before menu initialization or menus getting enabled incorrectly after a modal dialog is closed. Fix by always setting the state of the native menu item that contains the native menu. Also, autoenable is active for the main menu, resulting in unnecessary menu validation calls, so turn it off. Task-number: QTBUG-25544 Task-number: QTBUG-26399 Task-number: QTBUG-7538 Change-Id: Iab335af633604e7b3017eaa55464d1b8fdd7b821 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix autotests that no longer find executables on Windows.Friedemann Kleint2012-09-3013-57/+155
| | | | | | | | | | | The tests are now run from the 'debug', 'release' subdirectories on Windows by 'make check'. Go up one directory so that the relative paths are correct. Non-network tests. Change-Id: I8d0f806ff6708c3111a39c861ed46b21881acc7b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291358-32858/+32858
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* [QTBUG-27308][QTBUG-21534] Don't mouse-wheel-scroll QScrollBar when disabledMarc Mutz2012-09-271-0/+19
| | | | | | | | | | | | | | | | The Qt 5 fix (aec5b76) doesn't apply here, because it introduces a new symbol that might break forward compatibility if code compiled against a newer Qt 4.8 is run against an older Qt 4.8, and QScrollBar::wheelEvent() ends up being devirtualised. So copy the guard clause from QWidget::event() here. Task-number: QTBUG-27308 Reported-by: chenjiexin Task-number: QTBUG-21534 Reported-by: Martin Koller Change-Id: I5d2f823c65bae8cff33bac320c37e6496b14646c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Include the signal code in the argument of (dis)connectNotify().Thomas McGuire2012-09-261-18/+29
| | | | | | | | | | | | | | | | As it turns out, the convention of (dis)connectNotify() is to include the signal prefix, i.e. '2'. Therefore add this prefix also when calling these functions from QML. Also add a unit test confirming that the C++ and QML cases are now handled the same way. This patch is not needed in Qt5, as connectNotify() and disconnectNotify() take a QMetaMethod as a parameter, not a const char*. Change-Id: I3add0fc13c60a479949cf3d31218af5fd3f546a2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Revert "Delete JS-owned QML objects right away in the engine dtor."Peter Kümmel2012-09-253-62/+1
| | | | | | | | | | | This reverts commit ecc432a5b7ae269220f86c6f0b3dd364f8643191 to fix a crash on exit. Task-number: QTBUG-20377 Change-Id: I6606ff194f2c16e06bdbbfca94e55821cf055f75 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* HTTP header may be damaged - fix, unit testTomasz Duda2012-09-251-0/+76
| | | | | | | | | | | | | | | | | | | | | | "HTTP/1.1 100 CONTINUE\r\n" If the header from a server is splitted between two packets the first packet contains "HTTP/1.1 100" and the second one contains " CONTINUE\r\n", one space (0x20) is skipped. After processing the line looks in this way "HTTP/1.1 100CONTINUE". QHttpNetworkReplyPrivate::readStatus(QAbstractSocket *socket) is called twice, if a http header is splitted as above. The function always removes whitespace from the beginning of a packet, even if it is the second part of a http header QHttpNetworkReply returns QNetworkReply::RemoteHostClosedError due to damaged http header during processing. Task-number: QTBUG-27161 Backported qtbase/60f4fc8b706db9cbeacd5dc4886a7aa347daafc0 Change-Id: I07ec43641bbb9966285a8a1f57a51fb27d2643d4 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fixed inconsistent rounding of square cap pens.Samuel Rødal2012-09-251-0/+30
| | | | | | | | | | | | | A horizontal line should round up at the same time as a vertical line with square cap, when rendering at subpixel coordinates. Thus, the special casing in the cosmetic stroker of offsetting by half a pixel should be for flat caps instead of for square caps. Task-number: QTBUG-26013 (cherry picked from commit 72aaba336c7afe6d79d59995bfb31a8effca4e9e) Change-Id: If7e7c6b6e37c5b1ce4685012a11fd29ff0b1df5a Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* test: Mark tst_QFile::writeLargeDataBlock() unstable failure as XFAILSergio Ahumada2012-09-241-1/+11
| | | | | | | | | | The test has one unstable failure on Windows, so mark this with QEXPECT_FAIL Task-number: QTBUG-26906 Change-Id: I2f6c63ddefecacd224d93f83e6951e961a02a051 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> (cherry picked from qtbase/531b96f42ef225f6f680f6049ab718b0f6729a3d) Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* tst_qfileinfo: also define SRCDIR for QNXRafael Roquetto2012-09-171-1/+1
| | | | | | | This change is not necessary on Qt5. Change-Id: Ie35db0d31dccd2771ba80030ee9104880f50e6b0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Symbian: move SRCDIR definition to .pro fileRafael Roquetto2012-09-172-2/+1
| | | | | | | | | | This makes this test in line with other tests that define SRCDIR on the pro file instead. This change is not necessary in qt5 Change-Id: I789288c42a5c48bb62919fb361d2a357a8dd9832 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Blackberry: fix tst_QFileInfo::fileTimes()Rafael Roquetto2012-09-171-4/+7
| | | | | | | | | | The Blackberry OS uses a filesystem with the noatime option, which returns a "wrong" access time. cherry-picked from qt5 31f94e028527ffa02b954a3a91eabe80e2926838 Change-Id: Ic37d19b62ffbed6f67dbbbdf76bb4202bb0472e5 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Fix crash when invalidating a QSortFilterProxyModelStephen Kelly2012-09-141-0/+61
| | | | | | | | Backport of d7a15fbfd93fb566c7793596ea50d8786b9eb654 from qtbase. Task-number: QTBUG-27122 Change-Id: I0b1eda292fd9648e6f08629f7a069b66bb8b59e8 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Delete JS-owned QML objects right away in the engine dtor.Thomas McGuire2012-09-143-1/+62
| | | | | | | | | | | This prevents memory leaks when the engine is destroyed after exec() has already finished. In most cases this happens during application shutdown, at which point the event loop is never entered again. Task-number: QTBUG-20377 Change-Id: I65564ed3e56314d656d92fd66f11ae67d4eb932b Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Blackberry: fix tst_QFileInfo::isWritable()Rafael Roquetto2012-09-141-1/+4
| | | | | | | | | | | This test checks the access permissions for '/etc/passwd', however the filesystem on Blackberry is always read-only. cherry-picked from qt5 4a588c27e8073076cca19a8cc6eed5f1ce1d07e2 Change-Id: I6d14785dd94205761e3a73fc7aa420b805cd13a6 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Fix regression in QTextDocument::toHtml() with font pixel sizeEskil Abrahamsen Blomfeldt2012-09-131-0/+13
| | | | | | | | | | | | | | Introduced by 2e0003eda4783f69a40fb4b31e7084c761d9640d. We were missing a attributesEmitted=true which caused the output from toHtml() to sometimes be invalid when using pixel sizes to specify the font size. This is a back-port of e640ebacb97f6eea9614925b1da3b97a0ff51409 from Qt 5. Task-number: QTBUG-25778 Change-Id: Ied61fcaef425a590d71c0b52292ac676cb88ba52 Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
* tst_qchar: also define SRCDIR for QNXRafael Roquetto2012-09-091-1/+1
| | | | | Change-Id: I543274c8f3ebb5f7f6cb8e6fc68cc9ee29050ac6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>