summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Remove obsolete comment from QDataStream test.Jason McDonald2011-11-181-3/+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>
* Improve QBuffer autotest.Jason McDonald2011-11-181-16/+43
| | | | | | | | | | | | | | | | | | | | 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>
* Fixed crashes from tests using xcb plugin with -qtnamespace.Rohan McGovern2011-11-180-0/+0
| | | | | | | | Use QT_BEGIN_NAMESPACE/QT_END_NAMESPACE consistently in xcb plugin. Some, but not all, of the sources were already using QT_BEGIN_NAMESPACE. Change-Id: I23b83cc88870fd4039437b733084ab86dd807356 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Fixed crashes from tests using xcb plugin with -qtnamespace.Rohan McGovern2011-11-1812-2/+49
| | | | | | | | Use QT_BEGIN_NAMESPACE/QT_END_NAMESPACE consistently in xcb plugin. Some, but not all, of the sources were already using QT_BEGIN_NAMESPACE. Change-Id: I23b83cc88870fd4039437b733084ab86dd807356 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Don't depend on moc to disable test functions.Jason McDonald2011-11-180-0/+0
| | | | | | | | | | | | | | | | | | | | | The moc tool is not aware of all defines (particularly those that are compiler builtins) and does not correctly evaluate others that depend on compiler builtins, such as Q_OS_FOO. This commit reverts parts of the following commits, but is not a complete fix as there were many instances of this problem in the tests prior to those commits: 924d810dbdcd5b5b0fa860922b2487ea9062d002 8aaff6751038b88d17e23be6fcee945771297c5b 338d3f11973412047c2c9cd41cbd0c961d738ef3 a55034062ba2bf73a9f1ed3d9cf31745b38149e3 253497b7446c7d723aa3bdd7152e25d6852f2604 7cfad460c56319ba89c4a3a0bbcb2e54ab1cdbc6 9d2ff58f3642828e494e7e9b2df7dbb8e2cd408f 0cf6baa2d61ebaad2a2a0530c37f27e719b68f4b Change-Id: I947d797fe3ec76139ba1b55561cea569895662c5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* configure: clean up whitespace, comments.Rohan McGovern2011-11-180-0/+0
| | | | | | | | | | Make the indentation sensible. Remove comments which merely repeat the name of a variable on the next line. Change-Id: Ic3ecaaaba61795aeee10299ee44523eb725ecad9 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* configure: clean up whitespace, comments.Rohan McGovern2011-11-181-24/+13
| | | | | | | | | | Make the indentation sensible. Remove comments which merely repeat the name of a variable on the next line. Change-Id: Ic3ecaaaba61795aeee10299ee44523eb725ecad9 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Don't depend on moc to disable test functions.Jason McDonald2011-11-1863-855/+854
| | | | | | | | | | | | | | | | | | | | | The moc tool is not aware of all defines (particularly those that are compiler builtins) and does not correctly evaluate others that depend on compiler builtins, such as Q_OS_FOO. This commit reverts parts of the following commits, but is not a complete fix as there were many instances of this problem in the tests prior to those commits: 924d810dbdcd5b5b0fa860922b2487ea9062d002 8aaff6751038b88d17e23be6fcee945771297c5b 338d3f11973412047c2c9cd41cbd0c961d738ef3 a55034062ba2bf73a9f1ed3d9cf31745b38149e3 253497b7446c7d723aa3bdd7152e25d6852f2604 7cfad460c56319ba89c4a3a0bbcb2e54ab1cdbc6 9d2ff58f3642828e494e7e9b2df7dbb8e2cd408f 0cf6baa2d61ebaad2a2a0530c37f27e719b68f4b Change-Id: I947d797fe3ec76139ba1b55561cea569895662c5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed compile of autotests with -qtnamespace.Rohan McGovern2011-11-180-0/+0
| | | | | | | Make sure to use the Qt namespace for qGlobalPostedEventsCount. Change-Id: I558a0b0fba1e22a2edd96f9499a2bab82046c4a4 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Fixed compile of autotests with -qtnamespace.Rohan McGovern2011-11-182-2/+4
| | | | | | | Make sure to use the Qt namespace for qGlobalPostedEventsCount. Change-Id: I558a0b0fba1e22a2edd96f9499a2bab82046c4a4 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Call invalidateResource() on QOpenGLMultiGroupSharedResource-owned resourcesKent Hansen2011-11-170-0/+0
| | | | | | | | | Commit 202127f860208c21145e05685bc54219e1655dbd ensured that QOpenGLMultiGroupSharedResource-owned resources are deleted, but it was missing a call to invalidateResource(). Change-Id: I166ce8a7298772408081331fe1a91bd2cd88aebb Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Update V8Kai Koehne2011-11-170-0/+0
| | | | | Change-Id: Ie6157e0baa55271707b3e00ed80b67ab79f4f570 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Update V8Kai Koehne2011-11-1713-77/+381
| | | | | Change-Id: Ie6157e0baa55271707b3e00ed80b67ab79f4f570 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Call invalidateResource() on QOpenGLMultiGroupSharedResource-owned resourcesKent Hansen2011-11-173-3/+38
| | | | | | | | | Commit 202127f860208c21145e05685bc54219e1655dbd ensured that QOpenGLMultiGroupSharedResource-owned resources are deleted, but it was missing a call to invalidateResource(). Change-Id: I166ce8a7298772408081331fe1a91bd2cd88aebb Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix tst_Moc::oldStyleCastsOlivier Goffart2011-11-170-0/+0
| | | | | | | | | This tests that the moc generated file produces no warnings with very pedentic compilation flags. In that case, there was a warning because of the use of the C casts Change-Id: Ie79c6d053ff35c55276a07212c5d60f759f693ee Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Fix tst_Moc::oldStyleCastsOlivier Goffart2011-11-171-2/+2
| | | | | | | | | This tests that the moc generated file produces no warnings with very pedentic compilation flags. In that case, there was a warning because of the use of the C casts Change-Id: Ie79c6d053ff35c55276a07212c5d60f759f693ee Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Reimplement QMetaType::typeName.Jędrzej Nowacki2011-11-170-0/+0
| | | | | | | | | New implementation is slightly faster (~30%) and it is not dependent on order of definitions in QMetType::Type. Which means that we do not have to maintain a separate type list. Change-Id: I0ceb8c919c08afaa55146fbc3f021b78ffc2c063 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Reimplement some QMetaType methods.Jędrzej Nowacki2011-11-170-0/+0
| | | | | | | | | Methods of QMetaType; sizeOf, construct and destruct were reimplement using QMetaTypeSwitcher. The change should have impact only on maintenance (by removing 3 type switches). Change-Id: Iac3eb52de75d46f12ac32f229a26aec5b5bc7af2 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix sliders style issues.Pierre Rossi2011-11-170-0/+0
| | | | | | | | Due to their widget heritage,some styles' logic for drawing sliders incorrectly assumed a rect with a top left point at (0,0). Change-Id: I02d9c32d925650ccb36e2b917dd890e5d2bbf925 Reviewed-by: Jens Bache-Wiig
* Fix sliders style issues.Pierre Rossi2011-11-172-28/+33
| | | | | | | | Due to their widget heritage,some styles' logic for drawing sliders incorrectly assumed a rect with a top left point at (0,0). Change-Id: I02d9c32d925650ccb36e2b917dd890e5d2bbf925 Reviewed-by: Jens Bache-Wiig
* Reimplement some QMetaType methods.Jędrzej Nowacki2011-11-171-369/+205
| | | | | | | | | Methods of QMetaType; sizeOf, construct and destruct were reimplement using QMetaTypeSwitcher. The change should have impact only on maintenance (by removing 3 type switches). Change-Id: Iac3eb52de75d46f12ac32f229a26aec5b5bc7af2 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Reimplement QMetaType::typeName.Jędrzej Nowacki2011-11-171-97/+35
| | | | | | | | | New implementation is slightly faster (~30%) and it is not dependent on order of definitions in QMetType::Type. Which means that we do not have to maintain a separate type list. Change-Id: I0ceb8c919c08afaa55146fbc3f021b78ffc2c063 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Improve the testability of QSslOptions.Richard Moore2011-11-170-0/+0
| | | | | | | | | | The handling of QSslOptions is complicated not only by the subject, but also by the fact that some of the openssl directives are negatives. This commit tries to separate the inherent complexity from the complexity of the api by allowing us to test them independently. Change-Id: Ieb9386c69dd9b0b49dc42e26b2878a301f26ded1 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* Improve the testability of QSslOptions.Richard Moore2011-11-173-29/+79
| | | | | | | | | | The handling of QSslOptions is complicated not only by the subject, but also by the fact that some of the openssl directives are negatives. This commit tries to separate the inherent complexity from the complexity of the api by allowing us to test them independently. Change-Id: Ieb9386c69dd9b0b49dc42e26b2878a301f26ded1 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* Fixed compile of QtPlatformSupport with -qtnamespace.Rohan McGovern2011-11-172-0/+8
| | | | | | Change-Id: Iba411d35abe85ecf29a44d99113954a0561ae286 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Fixed compile of QtGui with -qtnamespace.Rohan McGovern2011-11-171-4/+4
| | | | | | | | GL headers should not be included inside of the Qt namespace. Change-Id: Ib19cbd3ab7b071a96e0816798f8ebc3fd4e28448 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Fix compilation with -force-asserts.Friedemann Kleint2011-11-171-3/+3
| | | | | Change-Id: I2f697ba9ab9a5a8393e778abad4da18c7f232d7f Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>