summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* test: fixed tst_qfilesystemmodel and removed insignificant_testRohan McGovern2012-07-132-2/+4
| | | | | | | | | | | tst_qfilesystemmodel::sort uses some internal API to affect the sorting behavior. This means that part of the test must be disabled when private symbols aren't available. Change-Id: I2e7b9d7a33cb3e7032bc5380c03fa29ecc84e12c Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> (cherry picked from commit 4e84be2876543c1bfcab3b854c92a7edade4144b) Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QSqlTM: respect generated flag in insertRecord() and setRecord()Mark Brand2012-07-131-0/+25
| | | | | | | | | | | | | | | | These methods failed to respect the setting of the generated flag on the fields of source record. INSERT and UPDATE statements should only include fields where generated is TRUE. Test included. Follow-up to 0f15ab4e750690bdb2b649332d5c3276bf24c440. Change-Id: I2f10dbcd7e5e5123489b38a123effe43a673a427 Task-number: QTBUG-23592 Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Jason Dolan <jason.t.dolan@gmail.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix crash when column is inserted before rowspanned cellEskil Abrahamsen Blomfeldt2012-07-131-0/+29
| | | | | | | | | | | | | | When you're inserting a column in front of a rowspanned cell and this cell is not the first in the rowspan, we would get the wrong logical index of the new cell (putting it in front of the initial cell with the rowspan). If the cell does not span all rows, the table will get into a broken state and trigger asserts in update(). To fix this, we search for the first cell after the insertion point which has a logical index higher than the cell directly before the insertion point. Change-Id: Ic6fb66bc25ad91f3534886f964173ead924429e2 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Mark qglfunctions test as insignificantKalle Juhani Lehtonen2012-07-021-1/+4
| | | | | | | | | | | | qglfunctions was previously skipped due missing OpenGL support on Windows machines. After installing Mesa 3D OpenGL library the test started to run, but it fails. Marking test to insignificant until the issue is resolved. Task-number: QTBUG-26390 Change-Id: I783132a33de4e4483ff074c0df7b977e02e7fc7a Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed tst_qfileinfo for windows.Markku Heikkila2012-06-281-0/+13
| | | | | | | | | | Manually cherry picked from Qt5 SHA 85594bd9 Task-number: QTBUG-25563 Change-Id: I16131e33712702028843f0404b65ea9f7b04c7d5 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix infinite recursion while dragging toolbar of QMainWindow.Markku Heikkila2012-06-251-0/+59
| | | | | | | | | Prevent recursion in QMainWindowLayout::endSeparatorMove(). Task-number: QTBUG-21378 Change-Id: Ie40005a35918d4da7ef911f8c3b1d1c3b5cf4fd2 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Restored native behavior when moving cursor from selectionRobert Loehning2012-06-202-4/+16
| | | | | | | | | Reverting changes from 1b031759ddfdab9703dfecac13f1ed318da3dafe except for Mac Task-number: QTCREATORBUG-7215 Change-Id: I8570c4bd35daf8b5820507a9399d33d00f96d41b Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Activate QPixmap auto-test.Friedemann Kleint2012-06-191-2/+0
| | | | | Change-Id: Ie6fe917406ef402b077f7fa55a5fb4dfbbf4fbb5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix QApplication test for desktop.Friedemann Kleint2012-06-194-35/+61
| | | | | | | | | | | | | | | - Set the working directory such that the binaries are found: Mac: disable app-bundle Windows: cd up if we are in a debug, release folder - Suppress the debug/release folder for the wincmdline process, make it a simple console app. - Print proper message if process launch fails. - Restrict insignification to qws/embedded due to an exit crash. Expect-fail focus test on Mac. Task-number: QTQAINFRA-428 Change-Id: I3aaa9c5faf97557717eaa84d343e5cb59f6a53e2 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix QLibrary test.Friedemann Kleint2012-06-192-4/+19
| | | | | | | | - Use correct working directory. Task-number: QTQAINFRA-428 Change-Id: I31fdc941fe21e2efa29d742a5b8cd89f2214e81c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix tst_qfile with shadow buildsThiago Macieira2012-06-181-1/+1
| | | | | | | | Teach it to find this file in the SRCDIR. Change-Id: I64e3926f10304efc15faa28b2b98569400802c59 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* Fix tst_qfile opening of stdin/out/err: don't assumeThiago Macieira2012-06-181-30/+40
| | | | | | | | | | | | The standard streams can be redirected to a file, so don't assume anything, but try to get the actual size and position from the OS and from the C library (stdout is usually buffered, so the result of lseek might be different from ftell). (cherry-picked from qtbase commit ba7f664a7fbb5612126e5144e58240ab05968259) Change-Id: Ice4a0aa21726671928f56a13cc07cc0e4b52091d Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* UCD 5.0: Apply Unicode Corrigendum #6Konstantin Ritt2012-06-131-0/+22
| | | | | | | | | | | | | | http://unicode.org/versions/corrigendum6.html: > in Unicode 5.0, the list of characters with the Bidi_Mirrored property > was made consistent for brackets and quotation marks, in preparation for > new constraints on bidi mirroring. However, after publication of > Unicode 5.0.0 it was discovered that this change adversely affected > several quotation mark characters in deployed data. Task-number: QTBUG-25169 Change-Id: I2cd6a70a69f4b2c37a3f191e05233854a16f10d1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QFile-test: Test for redirected handles in standard streams test.Friedemann Kleint2012-06-131-7/+18
| | | | | | | | | | | This is similar to 2509a5b5a49ea52948b434578ff29e7f9ba60b40 in Qt 5 (qtbase). In 4.8, stdout also seems to be affected, whereas in Qt 5, the problem occurred for stdin. Task-number: QTQAINFRA-428 Change-Id: Ia644923bdb76d0ac3c218c843fefcf280ee729cb Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix QFile test for Qt 4.8.Friedemann Kleint2012-06-092-15/+67
| | | | | | | | | | | | | | | | | - Locate the stdinprocess from the application path. - cd to SRCDIR such that the relative paths always work. - Introduce a NO_NETWORK_TEST defines making it possible to run the tests without network infrastructure. Task-number: QTQAINFRA-428 Change-Id: Ib2514a4da0f9814f83ae1d7931614fd159968b0c Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix for QEventLoop autotest for SymbianMarko Kenttala2012-06-071-4/+7
| | | | | | | | | | | | | | | Test deliverInDefinedOrder_QTBUG19637 was skipped in Symbian to avoid crashing. Test crashed because object events could not be processed in time in slower Symbian devices. Added waiting for all events to be processed before checking actual event count. Task-Number: QTBUG-23974 Change-Id: Idd79d4ec9fe21a4f03f2d9ba2e365abbbc45c9d8 Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Windows: Fix uic3 autotest.Friedemann Kleint2012-06-022-3/+2
| | | | | | | | | | | | | After 39f2c09d9154e00409c73c6f6db90a4ddb06b8f0, Windows applications of type Gui/Tty (uic3) would emit many "QPixmap: Cannot create a QPixmap when no GUI is being used" when initializing the cursor cache, breaking the stderr checking of the test. Task-number: QTQAINFRA-428 Change-Id: Iac74fd7af905e462ac2063c58dfcd91a6b0759a7 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* test: Remove insignification of tst_qprocess on Windows and MacSergio Ahumada2012-06-011-2/+0
| | | | | | | This test was fixed by 79a3efbd95f6df17dc1f922b469c67d86183c233 Change-Id: I4cd9f16d315de3c3f6777961ea3e682d4a1226bd Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Eliminate QTreeWidget drag crashJiewen Wang2012-05-311-0/+43
| | | | | | | | | | | | | In QTreeViewPrivate::adjustViewOptionsForIndex() wrong index had been used when referencing to array of viewItems. Variable row is set to the index of the QModelIndex, however it is not as same as the index in viewItems[] when there was hidden item in treeWidget. Index of viewItems[] should be used here. Unit test is added as well. Change-Id: Ie129cb63445bf1239ef7c5b2bc61b04dd9e81982 Task-Id: QTBUG-25333 Backport of <3be6ca3ee8c2c72f85b26a57538fd329ed811261> from Qt5 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* QStatusBar::showMessage will always take new timeoutJiewen Wang2012-05-311-0/+45
| | | | | | | | | | | | There is a message check in QStatusBar::showMessage causing the call exits early if the new 'message' is the same as the current message. The check has been removed, and new timeout will always take effect. Unit test is added as well. Change-Id: Id3d6ed15104d4d40c1cd2c76444c30badc8b1b72 Task-Id: QTBUG-25492 Backport of <7381328bcc37283be97eedddc24c46be1e38490e> from Qt5 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Fix qprocess test.Friedemann Kleint2012-05-312-118/+252
| | | | | | | | | | | | | - Set the working directory such that the binaries are found: Mac: disable app-bundle Windows: cd up if we are in a debug, release folder - Suppress the debug/release folder for the wincmdline process, make it a simple console app. - Print proper message if process launch fails. Task-number: QTQAINFRA-428 Change-Id: Iaa730ade9f65240bc361bc49d409c51af1af42a9 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Propagate left key presses to the parent item when TextInput is empty.Marcel Schuette2012-05-302-1/+23
| | | | | | | | | | Don't overwrite the ignore value once it's been set to true. Backport from Qt 5.0 to Qt 4.8 (commit a7017465152d544a4217d5ce4f6f84b80cb9b8b9) Task-number: QTBUG-25447 Change-Id: I2232806b1235b0c901aab21116b5bc70c65d0500 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* 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>