summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Fix crash when using aliases and variantsNicolas Arnaud-Cormos2012-05-253-0/+11
| | | | | | | | | | Right now, the parser crash when using id.variant.property for an alias. The current patch fix the crash, and it displays an error message in the console now (like QtQuick 2). Task-number: QTBUG-25341 Change-Id: I5e2c13f487655fd2b90129c5693f5daf3f77984b Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix bug when destruction fields in QWizardCarl Schumann2012-05-253-1/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked a70b8d407e1ca46e5dc208580534feee7ddfe51a from Qt5's qtbase master branch. Maintain the consistency of QWizardPrivate's two members: QVector<QWizardField> fields; QMap<QString, int> fieldIndexMap; during and after calls to QWizardPrivate's void _q_handleFieldObjectDestroyed(QObject *) member function. The failure to maintain this consistency caused an out of bounds access and core dump in QWizard's field(const QString &name) member function. QWizard's field(const QString &name) member function expects the values in the QMap fieldIndexMap to be indexes into the QVector fields. Prior to this change _q_handleFieldObjectDestroyed only removed the appropriate entry from the map and erased it from the vector. It did not decrement by one all the indexes greater than the index that was removed from the map and erased from the vector in the rest of the map. For example ... So if initially have the following mapping ... "field0" -> 0, "field1" -> 1, and "field2" -> 2 with fields of size 3. After destruction of "field1" have ... "field0" -> 0, and "field2" -> 2 with fields of size 2. Now attempts to look up "field2" using QWizard::field will have an out of bounds error and possibly core dump or trigger an internal Qt assert because an attempt to access this->fields[2] will be made. It should be accessing this->fields[1], but does not because the map is no longer consistent with the vector. This change adds a decrement by one for all the indexes greater than the index that was removed from the map and erased from the vector. Task-number: QTBUG-25691 Change-Id: Ia2a41027628a65faec4ecdd5da235ddd19746a57 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Add test case for link local TCP connectionsShane Kearns2012-05-241-0/+72
| | | | | | | | | | The socket engines already implemented this, but it is a good idea to test it explicitly. Task-number: QTBUG-25634 Change-Id: Ife3fe09b0119ed435e4055523c553847739a09fe Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (back ported from commit e5f77fe31be0ea2c891eacd3e866bb9db4e0a238)
* Fix sending UDP packets to link local addressesShane Kearns2012-05-241-0/+136
| | | | | | | | | | | | | | When the scope ID is not set, Mac and Windows will not transmit packets to link local addresses. This patch implements setting the scope in the native socket engines and adds a test case. (it was partially implemented already, though UDP specific code paths were missed in the unix engine) Task-number: QTBUG-25634 Change-Id: I23300bdc9856e38458078e913daaa59cd05a74b5 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (back ported from commit 6abc66e076826b24cc3700c3a0702f552ab50429) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QRegExp: fix crashGiuseppe D'Angelo2012-05-231-0/+28
| | | | | | | | | | | | | | | Fixes a crash when invoking various QRegExp methods on an object *before* doing any match. For instance fixes: QRegExp re; re.matchedLength(); // crash Backport of commit 136c2bf18446f2bbe7052d638c29edbc0b8ef6bc from qtbase. Task-number: QTBUG-23352 Change-Id: I9c239ff790a139c7820ef1aeced89d31320ae6b0 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QRegExp: fix autotest, fix usage of uninitialized valuesGiuseppe D'Angelo2012-05-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | A (probable) typo was causing the code dealing with anchors to use uninitialized values. This used to work by chance, but was indeed detected by Valgrind f.i. when running tst_qregexp -- the indexIn test on anc11 data reported: ==3015== Conditional jump or move depends on uninitialised value(s) ==3015== at 0x514B4EA: PeppeQt::QRegExpMatchState::testAnchor(int, int, int const*) (qregexp.cpp:1813) [...] ==3015== Uninitialised value was created by a stack allocation ==3015== at 0x514B3EB: PeppeQt::QRegExpMatchState::testAnchor(int, int, int const*) (qregexp.cpp:1803) Fixing the code also makes the aforementioned test to succeed, therefore the #if 0 sections can be droppped. Backport of commits 281771ee201e591d4f40a161b93c71914b1b38f2 and 1fe7e557d75962c9c79cc344037a02ed50369430 from qtbase. Change-Id: I4d6cffdae737def1a47e72b46e40979e0aee1719 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix cases where functions are called with a drive and no slashAndy Shaw2012-05-161-1/+25
| | | | | | | | | | | | | | | | When a file is specified on a path that includes a drive letter followed by a colon but no slash then it didn't always account for the fact that this refers to the current path on that drive. This fixes the problems in completeBaseName(), baseName() and path(). Tests are also added for these three cases and some others too. Task-number: QTBUG-25353 Change-Id: I47a197c6af066f532442ad269be57597ec61303a Reviewed-by: Irfan Omair <irfan.omair@gmail.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> (cherry picked from commit cfb44c6528b2518274bf157388832d1d610ce0e4)
* XShaping drag and drop fixesAlbert Astals Cid2012-05-142-0/+255
| | | | | | | | | | | | No shaping rectangles means no interaction with the window The shaping rectangles are based on the window coords, so need to substract the window coords when checking for the point And some tests to prove this change is needed Backport from commit 07f3c1e26aa6dcd07a9705e7b2ea02ace9ea7c5d from qtbase Change-Id: I6dd6c75c2bd70463561445b4f4a3894c80981d26 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* fix composition (C/KC) of some sequencesKonstantin Ritt2012-05-111-0/+12
| | | | | | | | | | | | | an unassigned code point should be treated like a starter code point; thus, if we have met an unassigned code point in the currently processed sequence, we should start process the next one (but we know there are no composed character for an unassigned starter -> simply skip it) This patch doesn't apply to qtbase, commit 46b78113b22428e6f8540193fcf0e00591dbd724 solved the same issue in a different way. Change-Id: I781a26024878d8b83a182b0fd4e681be2a6d9a27 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Clicking on a disabled ListView's delegate breaks mouse interactionPasi Pentikainen2012-05-082-0/+65
| | | | | | | | | | A disabled Flickable should not filter children. This is a backport of change I9f0d8fbfd0922b5c6a9eaffa69212867359f79e0, from Qt5 (later discarded in QtQuick1 restructuring of Qt5). Task-number: QTBUG-20584 Change-Id: Id279907ee90faf19284c12b548467850662a7019 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add missing colon to tests/auto/auto.proRoy Mickos2012-05-041-1/+1
| | | | | | | | | | The pro file has a missing colon in the last line regarding help.pro. Although the intent was to exclude it from symbian compilation, the missing colon caused that it was dropped from all platforms. This fix will bring it back, while still excluding it from symbian. Change-Id: I3cf05505d969182556458272cf10bc8847476468 Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fix unit confusion in ccf3b9e48b2d773999a9a88e249f79380618cde6David Faure2012-05-041-4/+10
| | | | | | | | | | | I wrote nonsense in that commit. The older methods that take a timeout all take milliseconds, and the comments in the unit test really meant milliseconds, not seconds. 1s is not shorter than 100ms.... Backport of 972464262166752df0015fe1209a7ab307cc7105 Change-Id: I3539cf196848b483b8c3a96b45851a465fc2dfcb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* test: Mark test as significant on platforms other than Mac OS XSergio Ahumada2012-05-021-1/+1
| | | | | | | | This test only fails on Mac OS X at the moment, so enabling it for all the other platforms. Change-Id: I1e816e9b7bbae802c868e31b367b7e43bd673d87 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* test: Mark test as significant on platforms other than WindowsSergio Ahumada2012-05-021-1/+1
| | | | | | | | | This test only fails on Windows at the moment, so enabling it for all the other platforms. Task-number: QTBUG-25563 Change-Id: I42d1bf9046a643c12385ce3bc6d88572216691b4 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* test: Remove insignificiation from qxmlquery test on WindowsSergio Ahumada2012-05-011-2/+0
| | | | | | | This test has been always passing in the last 10 runs. Change-Id: I8c0be5bd8430544853df1b0b77bf229b76a0668b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* test: Remove insignificiation from qhttpnetworkconnection test on WindowsSergio Ahumada2012-04-301-2/+0
| | | | | | | This test has been always passing in the last 10 runs. Change-Id: I3dac52588c7032935957bf2f258353116d320ba3 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* test: Remove insignficiation from networkselftest test on WindowsSergio Ahumada2012-04-301-2/+0
| | | | | | | This test has been always passing in the last 10 runs. Change-Id: Ic867f786104f118008cf810df21ac6e68438c881 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix bug that made some autotests unrunnable on INTEGRITY targetKalle Viironen2012-04-278-19/+3
| | | | | | | | | | | Some autotests had else:integrity { patrs that defined SRCDIR so that those tests were unrunnable on INTEGRITY. This patch removes those defines. Task-number: QTBUG-24176 Change-Id: I26d3ee60c825fc57a60df1a7177176585733d099 Reviewed-by: Rolland Dudemaine <rolland@ghs.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Take account of spanned items in QTreeView when dragging.Stephen Kelly2012-04-261-0/+33
| | | | | | | | | Also remove some code which has been unused since it was introduced in 32182d107fa75e5619ecc91a81f50626f429ebe1 Task-number: QTBUG-25140 Change-Id: I27f9496c2c998de7ea858b943c2f19d979ef18c2 Reviewed-by: David Faure <faure@kde.org>
* Fix QThread start failure due to bad thread name on SymbianJuha Kukkonen2012-04-251-0/+146
| | | | | | | | | | | | | | | | | | RThread::Create() deems a thread name to be invalid, if it contains any of the characters: "*", "?", ":" or character is outside 0x20 - 0x7e range. This matches to the logic in User::ValidateName() that is used by RThread::Create() to validate thread name. In addition, maximum thread name length is 80 character on Symbian. It was possible that thread name contained e.g. colon that caused RThread::Create() to fail with KErrBadName (-28). Fix ensures that thread name contains only allowed characters. Task-number: ou1cimx1#996187 Change-Id: Ie6dd8c60bfed4e2f6cc48607ff0ff940d9cdae8a Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Windows - "bypass proxy for local..." also affects IP addressesShane Kearns2012-04-251-0/+4
| | | | | | | | | | | | | | | | | If the "bypass proxy for local addresses" option is enabled in the windows proxy configuration, then do not use the proxy for any IP address in the subnet of any network interface. As the systemProxyForQuery api is now offering HTTP proxy tunnels for TCP sockets, this change avoids local ad-hoc network connections being routed through the proxy. In the case where the local address was on a different interface to the proxy server, it may have been unreachable through the proxy. For example IP over USB or Bluetooth. Change-Id: I0842732832a7795112be029d923ed168edc008d6 (modified version of fffc900f78a191970c4eebced9c1af016a9ea6f4 in QtBase) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Moved qmljs_debug_arguments to QCoreApplicationRafael Roquetto2012-04-201-0/+8
| | | | | | | | | Enable the use of the QML debugger without QtGUI Based on Qt5's 9a096d9e. Change-Id: If97502bc5367e0faadfaf3bbe70b0c89ef2c75c2 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Bump Qt version to 4.8.2aksalova2012-04-186-6/+6
| | | | | | | | Change-Id: Iecae324b1ae00c0d6fb6ed36a8f4a27f51a31d07 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix out of bounds use of QVector API.Stephen Kelly2012-04-131-0/+10
| | | | | | | | | | This is a regression introduced by commit d63910575949106f84dacf04abaa14fc866aa66b. Task-number: QTBUG-24965 Task-number: QTBUG-25140 Change-Id: Ice9d90ebb81dcc3c0bc166eeb8f77a0ad9d99476 Reviewed-by: David Faure <faure@kde.org>
* Remove fileLineEndingTest from networkselftest.Miikka Heikkinen2012-04-131-26/+0
| | | | | | | | | | | | | | The fileLineEndingTest case doesn't test network in any way and it is conceptually wrong, too, as any tests where line endings are an issue should be handled with .gitattributes rather than forcing user to check out the repo with unix line endings. Task-number: QTBUG-24271 Change-Id: I73986993edc227cb68b8f61d51cc1cf458d20989 Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com> (cherry picked from commit fc8f92106d6743d4165de7d8a440b7e5dbd14391) Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fixes a regression; missing cursor blink when input mask is set.Andreas Aardal Hanssen2012-04-121-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I can't say for sure why q*linecontrol passes an empty rect to the updateNeeded() signal when an input mask is set; presumably the empty rect at some point has meant "full update", but there are a few problems with this. Surely a full update is wrong, even if the semantics have been lost in translation somewhere (likely the qlinecontrol refactoring). This fix ensures that empty rects from updateNeeded() are interpreted as a request to update the whole widget. A further improvement would be to ensure the line control doesn't request a full update when an input mask is set. The cursor is usually wider when a mask is set but because of QLineEdit::paintEvent()'s implementation, there is currently a mismatch between the cursor width as seen by q*linecontrol and what is actually drawn, which causes rendering artifacts if updateNeeded() sends the cursorRect(). Since QLineEdit and Q*LineControl aren't actively developed, it's best to keep this fix minimal, although the performance cost of updating the whole line edit when an input mask is set is unfortunate. cherry-picked from qt5/qtbase a9cda515177db1615f8d47becf2aa781f26955ae Task-number: QTBUG-7174 Change-Id: Ie51e015d760915e07b0220b770f04fc958d93a12 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Make QSslCertificate test fail instead of crashShane Kearns2012-04-101-6/+12
| | | | | | | | | | If the SSL dlls could not be loaded, then QSslCertificate::fromPath will return an empty list. Make the test check for this before triggering an assertion failure by calling first() Task-number: QTBUG-25229 Change-Id: Ib6280c02130142201016a3f15ddb6bd44bfa0f9f Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Fix QTcpServer::listen() returning true when the port is in use on OS X.Robin Burchell2012-04-031-0/+17
| | | | | | | | | | | | | | | | | | | | | Way back in the mists of time, someone added SO_REUSEPORT to socket binding, which was great, because otherwise it meant that multiple UDP sockets couldn't share the same port on OS X (as platforms with SO_REUSEPORT apparently don't support rebinding with SO_REUSEADDR). However: SO_REUSEPORT also means that *any* bind on a port will succeed, which is most definitely not wanted in the case of TCP sockets, so check the socket type before performing the actual bind. Also test that multiple listens don't take effect. Cherry-picked-from: qtbase/master/a84b42e6194be0f40bd8f961effef9947c07c832 Change-Id: I2f8d450bcfb8a7f3abd8918a4e789a850281dd13 Done-with: Thiago Macieira Done-with: Shane Kearns Task-number: QTBUG-6305 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* test: Mark test as insignificant on MacSergio Ahumada2012-04-031-1/+1
| | | | | | | | This test only fails on Mac at the moment, so enabling it for all other platforms. Change-Id: I7d9ca2152f43e718944c7a0439b633566620795f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* test: Mark test as insignificant on WindowsSergio Ahumada2012-04-031-1/+1
| | | | | | | | This test only fails on Windows at the moment, so enabling it for all the othe platforms. Change-Id: Ic85e321a369104c590f71e45891ddede208383fb Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Memory leak fix of sqlite driver when close failedHonglei Zhang2012-04-031-0/+54
| | | | | | | | | | | | | | If an ongoing query is not finalized before close function is called, sqlite driver can't close the connection to sqlite. In this case, the failure is only reported to the client via getLastError(). Even if the client want to handle this case, there is no easy way to revoke the close function. This commit finalizes all queries before close is called. Task-number: QTBUG-16967 Change-Id: I069f6073bd46f53780e13d269e44aa86366e0574 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Fix regressions due to partial QSslSocket::peek fixShane Kearns2012-03-301-1/+131
| | | | | | | | | | The fix broke HTTPS transactions with chunked encoding. It also broke use of a QSslSocket in unencrypted mode where peek and read calls are mixed. See change 68b1d5c17aa38d5921bdade2b0e0cb67c6c90513. Change-Id: Ib115b3737b0e4217496f5def10aaaea3c6452ff8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* tests: Mark unstable test as insignificant on WindowsSergio Ahumada2012-03-302-0/+4
| | | | | | | | | | | | Marked the following tests insignificant due to failures, these need to be fixed later and then re-enabled: tst_qhttpnetworkconnection tst_qsharedmemory Task-number: QTQAINFRA-428 Change-Id: I9b4d5490291799c63ff07cb8bc676c37989a7c6b Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* tests: Mark unstable test as insignificant on WindowsSergio Ahumada2012-03-291-1/+1
| | | | | | | | | | | | Marked the following tests insignificant due to failures, these need to be fixed later and then re-enabled: tst_qtextstream Task-number: QTQAINFRA-428 Change-Id: Id3b6b7c46d981bb64786c0c225f599784304ca4f Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Fix bug in qsslsocket peek()Kalle Viironen2012-03-191-0/+127
| | | | | | | | | Calling peek() for qsslsocket caused socket data to be copied into qiodevices buffer and therefore make it unaccessible in qsslsocket. Task-number: QTBUG-18498 Change-Id: Ie27a90a468be8158bd8afcd259dbb34483623c36 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix QDeclarativeItem::hasActiveFocus().Andreas Aardal Hanssen2012-03-191-0/+28
| | | | | | | | | | | | | | | | | | This function returns true if the item (or, in case it's a focus scope, one of its children,) has focus (i.e., will receive key events now), or will receive focus once the scene is activated. It also returns true if the item has not yet been added to a scene, but has subFocus, implicating that someone has called setFocus() on it prior to it being added to the scene; the latter case seen most commonly in unit tests. Cherry-picked from qt/qtquick1: bb364c14157df635cf166b293f8cab6c22534aa1 Task number: QTBUG-24681 Change-Id: I2f2d9dd81820e94202a44393a38972c868a774b7 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Harfbuzz-thai - fix buffer overflow when setting item attributesJohn Tapsell2012-03-141-0/+29
| | | | | Change-Id: I19eeb4ec25a7c6cb3f584e6290169f9f327b8713 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Optimise QFile::seek that doesn't move the file pointerShane Kearns2012-03-132-0/+159
| | | | | | | | | If the seek position matches the current file position, then avoid doing an implicit flush that could be expensive. Change-Id: I019858ffb36fe832b9aee8da0a7803cafc8f7f75 Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Improve type detection for query resultsAndy Shaw2012-03-121-0/+118
| | | | | | | | | | | | | | | When an aggregate function is used for a column in a SQL resultset then it should ensure that the right data type is reported for that column. This also concerns expressions when the returned column does not map directly to a table column. Test included for this. Task-number: QTBUG-22038 Change-Id: I681297accc979081d14b44d190ab9d5f83aac215 Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com> (cherry picked from commit 678ab52ccba0b6a6903e9aee404dbe84fb74c91d)
* Rework QNetworkProxyFactory::systemProxyForQuery autotestShane Kearns2012-03-091-21/+120
| | | | | | | | | | | | | | | | | | Rather than requiring specific hardcoded proxies in the system, it now checks the proxies returned by the system have the required capabilities for the request. Note the test will pass if no proxy is configured (as QNetworkProxy::NoProxy has all required capabilities) The test prints the returned proxy lists and elapsed time diagnostic for manual comparison and debugging. Change-Id: I621ef4d1d7264a98c3e8bd485c30bc1166fcbdf0 Task-number: QTBUG-19454 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 3c529933612ff022d139975d661e37c77b1b2e99) Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Windows - fix getsockopt calls for narrower than int optionsShane Kearns2012-03-071-0/+29
| | | | | | | | | | | | | | | | | | | Windows unhelpfully writes to only one byte of the output buffer when getsockopt is called for a boolean option. Therefore we have to zero initialise the int rather than initialising to -1 as was done before. This in general only works for little endian architecture, because the word would look like 0x01000000 on big endian. So I have added some compile time asserts in the assumption that windows is always little endian. This is ok for comparisons with 0/false, but not comparisons with true or nonzero values. Task-number: QTBUG-23488 Change-Id: I3c586d1ada76465fc045a82661f289920c657a4c Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> (cherry picked from commit 46e4a9d5231e2d9e35424259858713ca539b8e30)
* Make qget manual test compile without ssl supportShane Kearns2012-03-072-0/+6
| | | | | | Change-Id: I35f92328b79df1cfcae52fa6ff8290f260183aea Reviewed-by: Richard J. Moore <rich@kde.org> (cherry picked from commit 3fe79f23a97323521eb0182f8b46b0d0fc9ce44b)
* Bump Qt version to 4.8.1Girish Ramakrishnan2012-03-056-6/+6
| | | | | | | | Change-Id: I117e5dcd45397a9fbd1f033fc745ada00c221721 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix sizing in QGraphicsView itemsAtPosition auto testJonathan Liu2012-03-051-0/+1
| | | | | | | | | | The auto test may fail incorrectly depending on the width of the QGraphicsView frame. To ensure more consistent test results, the frame is disabled. Change-Id: I8d70fb07e45803230954f776947d525e4cf9050f Reviewed-by: Robin Burchell <robin+qt@viroteck.net> (cherry picked from commit b2fb578a115f554ec7a00558978e5532a2ac855a)
* 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>