summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Re-enable the corelib autotests on Mac OS XBradley T. Hughes2011-11-2111-3/+34
| | | | | | | | | | | | | | | | | | | This is the first change to re-enable the autotests for the individual qtbase modules. This means adding subdir.CONFIG=no_check_target for each module (except corelib) in tests/auto/auto.pro instead of in tests/tests.pro QFileSystemWatcher, QIODeice, QSettings, QTextStream, QSocketNotifier, QVariant, QPluginLoader, QLocale: These tests currently fail, which will block any changes that attempt to re-enable the autotests. Ignore the failures for now by marking them as insignificant. QAbstractItemModel: This test currently crashes, which can destabilize the CI system when attempting to re-enable the autotests. Skip this test for now by disabling the check target for it. Change-Id: Ie5147d5c5cfae5e7d0a495d5c4788ce92fe2e6d8 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Add Q_ENUMS and Q_FLAGS to enumeration InputMethodQuery and flag ↵Joona Petrell2011-11-211-2/+3
| | | | | | | | InputMethodQueries Change-Id: If6f535a28af06e7e1790d8876f99dcb9ab8a3b41 Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* qtbase tests: Fix some warningsFriedemann Kleint2011-11-2128-93/+63
| | | | | | | | - Fix warnings about QAtomicPointer/Int usage - Fix some gcc 4.6 warnings about assigned/unused variables Change-Id: Ib4dbf9110f0dad93ad48e97278310f05fad3a82a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete code from QRect test.Jason McDonald2011-11-211-126/+0
| | | | | | | | The removed code has been commented-out since Qt 4.0 and relates to QCOORD, which was part of Qt3Support and has thus been removed from Qt5. Change-Id: I4651738d505234abe9b79ef5045c55cbf132a88e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove empty functions from QLocale test.Jason McDonald2011-11-211-10/+0
| | | | | | | | These functions have been commented-out and empty for more than five years. Change-Id: I52d6dc0366cd8eae8701b05e4c66e9911bf7e8f7 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Restore commented-out code in QHash test.Jason McDonald2011-11-211-1/+1
| | | | | | | | | | | | | | The restored code verifies the following statement in the documentation of QHash::find(): "If the hash contains no item with the key, the function returns end()." It is not clear why the code was commented-out in the first place, as this occurred before the tests were imported into the Qt repository in 2006. Change-Id: I745393a8e3e728fc60009da07abd038a3d56e99c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Restore commented-out code in QByteArray test.Jason McDonald2011-11-211-3/+3
| | | | | | | | | The restored code was inexplicably commented-out by commit d57aec33 (non-public history), which was only supposed to be changing upper-case booleans to lower-case. Change-Id: I1581fc89511f600c614871e1aec6bc030cddf40e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* tst_qsslsocket: improve failure messageRohan McGovern2011-11-211-1/+1
| | | | | | | | | Cast enum to int so that we get the actual and expected values in the failure message, rather than merely "Compared values are not the same". Change-Id: Idc20e050c2e8a07d70f839c0a45044b070c0900e Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Remove obsolete code from QStateMachine test.Jason McDonald2011-11-211-366/+0
| | | | | | | | | The removed code was already disabled because it tested API that never made it into an official Qt release -- see commit f7d69d75 in the Qt 4.x history. Change-Id: I4f7eb20f937bdabfcac92842c5804233dca26a23 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete code from QStateMachine test.Jason McDonald2011-11-211-245/+0
| | | | | | | | | The removed code was already disabled because it tested API that never made into an official Qt release -- see commit ad1441fc in the Qt 4.x history. Change-Id: I7dbfb83c82bdb79e8d3f7f6c7043d76913dea589 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* tst_qsslsocket: don't run SSLv2 tests when SSLv2 has been disabledRohan McGovern2011-11-211-0/+16
| | | | | | | | | SSLv2 may be disabled in openssl at compile time. If so, do not attempt to test it. Change-Id: I189c8fde5b5dc8e739d54cc1adde1d3e3e217391 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix sporadic hang in QLocalServer::close() in OS X 10.7Robert Knight2011-11-181-4/+4
| | | | | | | | | | | | | | | | | | | | There is a bug in CFSocket/CFRunLoopSource in OS X 10.7 which can lead to a deadlock in CFRunLoopRemoveSource or CFRunLoopSourceInvalidate if the CFSocket manager thread is concurrently calling CFSocketInvalidate as a result of the socket's file descriptor having been closed. QLocalServer::close() triggers this race by closing the socket fd before unregistering the QSocketNotifier, which internally uses CFSocket. This commit fixes the problem by changing the ordering in close() so that the socket notifier is disabled before closing the file descriptor. This change also makes QLocalServer::close() perform operations in reverse order to QLocalServer::listen(), as would be expected. Task-number: QTBUG-22789 Merge-request: 1470 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit a9c3f7169faf4621d39714f753d6e8b376c5d6e5) Change-Id: Ia9c3f7169faf4621d39714f753d6e8b376c5d6e5
* Compile fix for Mac OS X 10.7 with 10.6 sdkAndy Shaw2011-11-181-2/+2
| | | | | | | | | | | | | Since it is an example it is cleaner to just include the header file as it will be available on other platforms anyway. Also ensured that the Qt includes were first before the system ones. Task-number: QTBUG-22641 Merge-request: 1462 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 4fffdabc948ff6afc6008d4cb723a6a2e10eef79) Change-Id: I4fffdabc948ff6afc6008d4cb723a6a2e10eef79
* Give better error message when using unsupported lookbehinds in QRegExpKjell Rune Skaaraas2011-11-181-0/+4
| | | | | | | Merge-request: 1456 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit e0383c9b8bd6f4e3d445d69690f84209cad42bb5) Change-Id: Ie0383c9b8bd6f4e3d445d69690f84209cad42bb5
* Fix QFile::copy() returning false but error() being NoErrorxiechyong2011-11-181-1/+4
| | | | | | | | | | | Calling close() after setError() will unset the error. Task-number: QTBUG-11982 Merge-request: 2712 Reviewed-by: ossi (cherry picked from commit 16f67b49ae5232d4d0fb19e0333f5e2ef2a65449) Change-Id: I16f67b49ae5232d4d0fb19e0333f5e2ef2a65449 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Harfbuzz shaper: kerning adjustment does not need to be modified by RTLJohn Tapsell2011-11-181-1/+1
| | | | | | | Merge-request: 1435 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 1b928f5e41888150c4d85ff4df8a9fcab9b06d90) Change-Id: I1b928f5e41888150c4d85ff4df8a9fcab9b06d90
* Add -nn for .cpp MOC preprocessing for INTEGRITYRolland Dudemaine2011-11-181-0/+1
| | | | | | | | | | | | | | | qmake generates .gpj project files for INTEGRITY. Calls to moc on headers or code that do not produce actual output cause a Note to be generated. This is considered as an error during build by the Green Hills gbuild build tool. -nn can be added to not generate that note when no output is generated. This was already done for headers in util/integrity/qt.bod, but it was not there yet for .cpp files. Merge-request: 2693 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 480b2f4c79160afaac7934936d3ae6ea382ae2bb) Change-Id: I480b2f4c79160afaac7934936d3ae6ea382ae2bb
* Remove commented out code.Rolland Dudemaine2011-11-181-7/+0
| | | | | | | Merge-request: 2693 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit c37ba1319c5789b82e14b84e9bc85ceff7cc6b5e) Change-Id: Ic37ba1319c5789b82e14b84e9bc85ceff7cc6b5e
* Build fix for WINCE to qfilesystemengine_win.cppjaanttil2011-11-181-1/+0
| | | | | | | Merge-request: 2662 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit f4f1b712e1389987e045bb8f6ba654ea9e11d24e) Change-Id: If4f1b712e1389987e045bb8f6ba654ea9e11d24e
* Fixed typo in QSettings documentation.Sam Protsenko2011-11-181-1/+1
| | | | | | | Merge-request: 1411 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit af448ba50d1c89548d41b7aebdf6047e8f2aabf2) Change-Id: Iaf448ba50d1c89548d41b7aebdf6047e8f2aabf2
* QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is ↵shkim2011-11-181-2/+0
| | | | | | | | | defined. Merge-request: 2690 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 4245a82a3eed3ec21b6affc5836af5b2ad2d42e4) Change-Id: I4245a82a3eed3ec21b6affc5836af5b2ad2d42e4
* Fix broken Solaris build (getpwnam_r usage)Iikka Eklund2011-11-181-1/+6
| | | | | | | | | | | | | Added ifdef inside qt_tildeExpansion function to use correct version of getpwnam_r depending on _C_POSIX_SOURCE version on Solaris platform. Task-number: QTBUG-21451 Merge-request: 1380 Reviewed-by: ossi (cherry picked from commit 48f64fc7ae9f0e9e8ab07ab60ccd55d3b053dfab) Change-Id: I48f64fc7ae9f0e9e8ab07ab60ccd55d3b053dfab Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* adding a getter cubicBezierSpline() to QEasingCurveThomas Hartmann2011-11-182-0/+13
| | | | | Change-Id: Ida722f013613d8633867a902660da30d28aeb918 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* configure.exe: Reduce size by using -O1 instead of -O2.Friedemann Kleint2011-11-181-2/+4
| | | | | Change-Id: Ica4d19364415180411cd74df7c3fb92d0100bfba Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* mkspecs: Case-insensitive check of paths on Windows.Friedemann Kleint2011-11-181-3/+10
| | | | | Change-Id: I2b46bce79774ed9e5b5f6d73cc6e62ae50e35a5e Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Windows: Adapt mkspec for MinGW / gcc 4.6.Friedemann Kleint2011-11-184-4/+11
| | | | | | | | | | | gcc 4.6 becomes the minimum required version in Qt 5. See also d4150975af620e2889cc58bd476bac6b4d101db3 in Qt 4.8. Change-Id: If66ce0be755263c20b0a4371523c6590592d962d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Document new input method hints introduced in Qt 5Joona Petrell2011-11-181-0/+6
| | | | | | Change-Id: Ic6aa77b410ed8189c2b100ca527a7019cdaf3b8b Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Resolve a number of compilation issues with INTEGRITYRolland Dudemaine2011-11-184-7/+17
| | | | | | | | | | | | | | First, #ifdef'ed out getpwuid_r() and getpwgid_r() usage since users/groups support is not in in single-process Posix mode. Also, correct a typo and add missing files to io.pri. Update documentation to disable libtiff which won't compile until ibtiff itself is updated, and add back -no-exceptions in the sample command line. And add a line to compile host tools. Add a dummy QT_OPEN_LARGEFILE definition in qplatformdefs.h since there is code that requires it. Move definition of getGlyph() after the definition of qHash(GlyphAndSubPixelPosition). Merge-request: 2686 Reviewed-by: ossi (cherry picked from commit 8fe04a14b1f3688c9ce0933ebec0c28616595d93) Change-Id: I8fe04a14b1f3688c9ce0933ebec0c28616595d93 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix doc typoOswald Buddenhagen2011-11-181-1/+1
| | | | | | | (cherry picked from commit 9c86b3b0028d79cbca129afafa33d72d624d65c3) Change-Id: I9c86b3b0028d79cbca129afafa33d72d624d65c3 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdkOswald Buddenhagen2011-11-181-1/+1
| | | | | | | | | | | | | When the 10.7 SDK was specified explicitly then it would fail the check inside the pro file. So this ensures that this is accounted for. Task-number: QTBUG-20516 Merge-request: 2657 Reviewed-by: ossi (cherry picked from commit ce1a25fc692abcaa1c825f465d6a158efa953b06) Change-Id: Ice1a25fc692abcaa1c825f465d6a158efa953b06 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove obsolete defineOswald Buddenhagen2011-11-181-1/+0
| | | | | | (cherry picked from commit 85cd78b01812d108f381e42b044abaa888c4146e) Change-Id: I85cd78b01812d108f381e42b044abaa888c4146e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix a memory leak in QXcbConnection.Jędrzej Nowacki2011-11-182-3/+3
| | | | | Change-Id: I2307bf434c53d9321c71609eeacc1f3883bbbb13 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* qtbase: Warnings fixes.Friedemann Kleint2011-11-1813-25/+17
| | | | | Change-Id: Ie97e36bc168b3de3cae2d0eb615e777884529a06 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Improve diagnostics of QPluginLoader test.Jason McDonald2011-11-181-4/+4
| | | | | | | | Use QVERIFY2 so that the test output shows the full error string when it does not contain the expected sub-string. Change-Id: I31f91bd5c47c082aacabd2333bc12137bc4d24a6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix indentation of QPluginLoader test.Jason McDonald2011-11-181-21/+21
| | | | | Change-Id: I4c6957d2a67ac387232226098b4490e3d5a86d51 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Improve QPluginLoader autotest diagnostics.Jason McDonald2011-11-181-53/+16
| | | | | | | | | | | Previously, the user had to recompile the test with an additional define to see the plugin loader error string. By re-ordering the verification statements, we can ensure that the error string is visible in the test results whenever its value is not the expected value, thus eliminating the need for conditional diagnostics. Change-Id: Iae9ef0b7cbad551fd56f0e0439eaad034f2420e3 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove disabled code from QLibrary autotestJason McDonald2011-11-181-5/+0
| | | | | | | | | | The removed code was already commented-out when it was first added in 2007, and would not form a useful test as it was not followed by any verification steps. QLibrary::setLoadHints() is tested elsewhere, so this code can vanish. Change-Id: I1c4dcaacaf31b0f38136336414cfbe3de1a406f3 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove disabled test data from QVariant test.Jason McDonald2011-11-181-4/+0
| | | | | | | | The removed data duplicated the first row of test data in the same function. Change-Id: I5d55b970d072d58c170b3ed3004c1661c6d0d13c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete code from QVariant test.Jason McDonald2011-11-181-2/+0
| | | | | Change-Id: If609ddbef7002cb48f4459efd8f2c6edb02c8677 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete code from QTimer test.Jason McDonald2011-11-181-5/+2
| | | | | | | | The removed code was for Windows versions <= 2000, which are not supported by Qt5. Change-Id: I779ffb8427035b7eb97d8d0af403d03065bc779c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Change confusing test function name.Jason McDonald2011-11-181-2/+2
| | | | | | | | | | | Naming a test function "_data" is potentially confusing as that string is a suffix reserved for functions that create data tables for data-driven tests. Presumably this function was accidentally caught in a search and replace at some point before the tests were imported into the Qt repository in 2006. Change-Id: I451c0400a1580233ee90b75dd5ad489ee3d3788e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix typo in QUrl autotest.Jason McDonald2011-11-181-3/+3
| | | | | Change-Id: Id85ad5c16e3a5b7a1614affa041d19f5062073fd Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete test data from QFileInfo test.Jason McDonald2011-11-180-0/+0
| | | | | | | | | | | The removed data relied on the test's own source file having no write permissions, but that is not a valid assumption -- in a source package the file wouldn't have had write permissions, in Perforce it would have depended on whether the file had been checked-out for editing and in git the file would always have write permission. Change-Id: I000596f122f2765f97a09a08074938c90e2e9f95 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete test data from QFile test.Jason McDonald2011-11-180-0/+0
| | | | | | | | | | | The removed data relied on the test's own source file having no write permissions, but that is not a valid assumption -- in a source package the file wouldn't have had write permissions, in Perforce it would have depended on whether the file had been checked-out for editing and in git the file would always have write permission. Change-Id: I3b6100429120137095a210189961c8b97f06e50a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete test data from QFile test.Jason McDonald2011-11-181-1/+0
| | | | | | | | | | | The removed data relied on the test's own source file having no write permissions, but that is not a valid assumption -- in a source package the file wouldn't have had write permissions, in Perforce it would have depended on whether the file had been checked-out for editing and in git the file would always have write permission. Change-Id: I3b6100429120137095a210189961c8b97f06e50a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete test data from QFileInfo test.Jason McDonald2011-11-181-1/+0
| | | | | | | | | | | The removed data relied on the test's own source file having no write permissions, but that is not a valid assumption -- in a source package the file wouldn't have had write permissions, in Perforce it would have depended on whether the file had been checked-out for editing and in git the file would always have write permission. Change-Id: I000596f122f2765f97a09a08074938c90e2e9f95 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Improve QBuffer autotest.Jason McDonald2011-11-180-0/+0
| | | | | | | | | | | | | | | | | | | | This commit fixes several issues found in the readLineBoundaries() test function. First, the test performed some test actions but did not perform any verification steps to check that the outcome of those actions was acceptable. Second, the test didn't need to write the buffered data to a file to verify line-by-line reading. Third, the get/unget action was unrelated to the readLineBoundaries() test and has been moved to a separate test function. That test function now tests that get/unget works at every position in a buffer, not just at position 0. Change-Id: Icad52ed598e94b6e05a194b9ab301d099bfc094c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete comment from QDataStream test.Jason McDonald2011-11-180-0/+0
| | | | | | | | | The removed comment was introduced before the tests were imported into the Qt repository in 2006 and seems to relate to code that no longer exists. Change-Id: Ic21e46fe0157adf5be9dc62de098517b7b27c310 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete comment from QDataStream test.Jason McDonald2011-11-180-0/+0
| | | | | | | | | The removed comment was introduced before the tests were imported into the Qt repository in 2006 and seems to relate to a test failure that no longer occurs. Change-Id: I01f372f6a4f48110711f4f2a86e73acfb7134e24 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete comment from QDataStream test.Jason McDonald2011-11-181-6/+0
| | | | | | | | | The removed comment was introduced before the tests were imported into the Qt repository in 2006 and seems to relate to a test failure that no longer occurs. Change-Id: I01f372f6a4f48110711f4f2a86e73acfb7134e24 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>