summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove Q_ASSERTs from qgraphicsanchorlayout1 testJason McDonald2011-05-031-16/+6
| | | | | | | | Sanity-check the test data when using it rather than when creating it. Change-Id: Ie5d5e1ff3fc439d196096f17cb6f97680927a90c Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
* Only ignore warning when it can actually be produced.Jason McDonald2011-04-211-1/+1
| | | | | | | | | | Fix regression introduced in 3ca51d87296bcb3098d7de14294fef9294fd5ed4. The warning is only generated in builds where QT_NO_DEBUG is not defined *and* the target is not Mac OS X. Change-Id: I7245f2eab8ea47ab7495fef874b2f8a29186b659 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
* Use meaningful variable namesJason McDonald2011-04-211-21/+21
| | | | | | | | Make the meaning of the code more obvious and avoid a compiler warning about the variable "w" being overridden. Change-Id: Ib76d3aa1cae46e263b2ab61b675d9ef74032aacc Reviewed-by: Rohan McGovern
* Fix logic error in large file autotestJason McDonald2011-04-211-3/+2
| | | | | | | | | | | | | | The function generating data blocks was filling the block to 16 bytes short of the blockSize, then appending three 8 byte values, causing the block to grow 8 bytes beyond blockSize and then truncating it back to blockSize. This commit makes the code fill the block to 24 bytes short of the blockSize, so that the block will always end up at the correct size and truncation is not needed. Change-Id: I9fe6e6d6cf7bc445513b53e0a910d205c4c8002f Reviewed-by: Rohan McGovern
* Remove Q_ASSERT from QDom autotestJason McDonald2011-04-211-11/+7
| | | | | | | | | The Q_ASSERT here should really be a QVERIFY. Expanded the trivial helper function to make it more obvious what the test does. Change-Id: Ia6017fe820a83b4d6101e5edcfcb68993eef233a Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
* Remove Q_ASSERT from datetimeedit autotestJason McDonald2011-04-201-9/+2
| | | | | | | | | | The assert and the last four parameters of makeList() are not needed. The function is always used to make lists of three integers and the data are all >= 0. Change-Id: I93ae5a5f541cde2ff61bd9dd21164ed4a9b57403 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
* Remove Q_ASSERT from qcopchannel autotestJason McDonald2011-04-201-1/+5
| | | | | | | | | | | This code would assert in a debug build and potentially crash in a release build. (The behaviour of QStringList::at() with an out-of-bounds index is undefined.) This commit makes the program exit with a useful error message in all builds. Change-Id: Ia57a2e5693eb25d3eb0b9ba701ed485dfbc1e846 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
* Remove Q_ASSERT from QCompleter autotestJason McDonald2011-04-201-4/+6
| | | | | | | | | | If a combobox had no completer, this test would assert in a debug build and crash in a release build. This commit makes the test report a test failure and avoid terminating in all builds. Change-Id: Ib2924412e3d55f10875675cb65079259cd4ef552 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
* Only ignore warning when it can actually be produced.Jason McDonald2011-04-201-0/+2
| | | | | | | | | | Fix regression introduced in 3ca51d87296bcb3098d7de14294fef9294fd5ed4. The warning is only generated in builds where QT_NO_DEBUG is not defined. Change-Id: I9aa3db369094f4046062b5dc1dc694342208ee45 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
* Remove Q_ASSERT from qcompleter autotest.Jason McDonald2011-04-201-1/+3
| | | | | | | | | Replace obscure failure on bad test data in debug builds with an informative warning in all builds. Change-Id: I9001820f34de2f78bf296a2f0e095ce73d9ac4bd Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
* Remove Q_ASSERT from qatomicint/pointer autotestsJason McDonald2011-04-202-4/+2
| | | | | | | | | | | Some code in these tests is not intended to be executed, but rather to detect compiler warnings. Instead of having an obscure fatal error if this code is run in a debug build, it now has a clear fatal error if run in any build. Change-Id: I1c9d27bb14ebf3313865b68e3e57668ba1d14e25 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
* Fix remaining warnings in accessibility autotestJason McDonald2011-04-191-32/+40
| | | | | | | | Prevent warnings about unhandled accessibility events by managing object lifetimes appropriately. Change-Id: If72a2a6a76527ff746b99634c2d0895354570724 Reviewed-by: Rohan McGovern
* Ignore expected warning in accessibility autotestJason McDonald2011-04-191-0/+2
| | | | | Change-Id: I4b614766d2451dde51ab1207267301a2fe7dd0f6 Reviewed-by: Rohan McGovern
* If accessibility isn't built, don't try to test itJason McDonald2011-04-193-217/+8
| | | | | | | | Only build the autotest when the feature to be tested is in the Qt build. This is better than building and running an empty test. Change-Id: I67721f5f48296afcca64f761d12325f8e040f2d8 Reviewed-by: Rohan McGovern
* Remove unused function.Jason McDonald2011-04-191-42/+0
| | | | | Change-Id: I197ca88e04a68dca0ea819d6e335a02607e597aa Reviewed-by: Trust Me
* Remove Q_ASSERT from accessibility autotestJason McDonald2011-04-191-2/+3
| | | | | | | | | | Instead of crashing when we can't get a QAccessibleInterface for a widget, output a useful warning and return a value that makes the test fail gracefully. Change-Id: I0b292cdd8f5a59e26bdc9b0b67cea2b58591df7d Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
* Remove unused functions.Jason McDonald2011-04-191-12/+0
| | | | | Change-Id: I8cae0550c58238bd99bc759c21b022c54fe2de8b Reviewed-by: Trust Me
* Remove Q_ASSERT calls from gestures autotestJason McDonald2011-04-191-2/+2
| | | | | | | | | | Make the test report a useful warning, rather than terminating with an unintelligible assertion failure, if the GestureState enum is ever extended. Change-Id: Ib876a5f2986cbea4e181678a83a72e0d1444f1ee Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
* Cosmetic changes to exceptionsafety_objects testJason McDonald2011-04-181-18/+15
| | | | | | | Sort test data alphabetically and remove excess whitespace. Change-Id: I0e244efca9e9adbe747a375a28a63f70992ef4f8 Reviewed-by: Trust Me
* Don't try to run exceptionsafety_objects test by default on windows.Jason McDonald2011-04-181-1/+2
| | | | | | | | This test relies on some API specific to MSVC's debug runtime, which is not always guaranteed to be available. Change-Id: Ib0ae4694ad51f59198dadfce802f0dfdf0522002 Reviewed-by: Rohan McGovern
* Partially re-enable exception safety testJason McDonald2011-04-181-2/+44
| | | | | | | Re-enabling for object types that don't crash the test. Change-Id: I8c2f0d02171c973bf1ede227d4139b52cac5939f Reviewed-by: Rohan McGovern
* Make test compile in namespaced build.Jason McDonald2011-04-181-0/+2
| | | | | Change-Id: I824864b8db755a8dc731e3c9de39e3dd7b16224a Reviewed-by: Rohan McGovern
* Rename test class.Jason McDonald2011-04-181-16/+16
| | | | | | | | Fixes warning from tst_maketestselftest about test class name not matching TARGET. Change-Id: I7a81d87bb64d2902e842d097248e33eacb388746 Reviewed-by: Rohan McGovern
* Make tst_exceptionsafety_objects part of the test set.Jason McDonald2011-04-152-1/+3
| | | | | | | | Re-enable this test, with the two test functions that fail on Linux disabled until the failures can be diagnosed. Change-Id: I915e1a0d675cb71a80086e89f9799a4f9f6b600c Reviewed-by: Rohan McGovern
* Remove Q_ASSERT from QDeclarativeListModel autotest.Jason McDonald2011-04-151-1/+4
| | | | | | Change-Id: Ic15b747fa50bcec54df748b173b299058f69c681 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
* Remove redundant Q_ASSERT from qmlvisual autotest.Jason McDonald2011-04-151-2/+0
| | | | | | Change-Id: I5c413793ee6322b5be1ae52658362803dc4c2010 Task-number: QTBUG-17582 Reviewed-by: Alan Alpert
* Remove Q_ASSERT calls that wrap side-effecting code.Jason McDonald2011-04-151-3/+9
| | | | | | | | | In release mode builds, code inside Q_ASSERT macros is not executed, so putting code with side-effects inside Q_ASSERT is not a good idea. Task-number: QTBUG-17582 Change-Id: I1a5d8ccce666ee7b7f120bf9cbb49e30dac9add4 Reviewed-by: Rohan McGovern
* Reduce usage of Q_ASSERT in autotests.Jason McDonald2011-04-1230-207/+197
| | | | | | | | | Using Q_ASSERT does nothing in release-mode builds, and in debug builds it causes tests to terminate prematurely. It is much better to use QVERIFY or QCOMPARE. Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
* Remove autotest code related to old Qt versionsJason McDonald2011-04-115-36/+2
| | | | Reviewed-by: Rohan McGovern
* Fix missing equality and inequality operator docs for QPointer.Jason McDonald2011-04-061-0/+10
| | | | | Task-number: QTBUG-18565 Reviewed-by: Rohan McGovern
* Fix typos in QSharedPointer documentation.Jason McDonald2011-04-061-11/+11
| | | | Reviewed-by: Trust Me
* Remove test for compiler correctnessJason McDonald2011-04-061-17/+0
| | | | | | | Unit tests are supposed to verify Qt, verifying the compiler is a different task entirely. Reviewed-by: Rohan McGovern
* Refactor qpointer dereference testsJason McDonald2011-04-061-19/+10
| | | | | | | The data method is just another way of dereferencing a QPointer, so test it in the same place as the other dereference operators. Reviewed-by: Rohan McGovern
* Prefer QCOMPARE to QVERIFY for comparisons.Jason McDonald2011-04-061-3/+3
| | | | Reviewed-by: Rohan McGovern
* Improve coverage of qpointer autotestJason McDonald2011-04-051-0/+7
| | | | | | | | Coverage analysis revealed that the assignment test was not exercising code that shortcuts assignment when assigning the value that is already held. Reviewed-by: Rohan McGovern
* Add comments, eliminate duplication in qpointer autotest.Jason McDonald2011-04-051-7/+17
| | | | | | | | Test destruction of guarded objects in the destruction test function, rather than partly there and partly in the assignment test. Reviewed-by: Rohan McGovern
* Remove redundant includes and functions from qpointer autotest.Jason McDonald2011-04-051-29/+0
| | | | Reviewed-by: Rohan McGovern
* Fix tst_XmlPatterns::xquerySupport() autotestSergio Ahumada2011-03-251-8/+8
|
* Merge qt/qt.git master into qa-team-masterRohan McGovern2011-03-241949-74768/+111147
|\
| * Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-03-2350-415/+1811
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fixed drawImage() not to attempt drawing null images on openvg. QS60Style: Update placeholder texture to real one Text bounding rect calculated incorrectly if non-top aligned. Bump Qt version to 4.7.4 Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform. Remove incorrect check in qpixmap autotest. Change the pooled QGLPixmapData to be backed by QVolatileImage. Started changes-4.7.4 file Fix endianness detection with gcc 4.6 -flto -fwhole-program remove redundand validateModes() call Changed s60 style not to rely on QPixmapData::toNativeType(). Add missing bitmap locking to QVGPixmapData::fromNativeType. Don't crash calling QTextDocument::blockBoundingRect on invalid block Prepare fromSymbianCFbsBitmap autotest for 16 bpp format. Fix writing to an attached property from script. fixes/improvements for new QML right-to-left docs Fix license headers in example code Write Qt Quick 1.1 right-to-left documentation and examples Doc fix - QtQuick 1.1 scheduling
| | * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-222-2/+20
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-222-2/+20
| | | |\ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Text bounding rect calculated incorrectly if non-top aligned.
| | | | * Text bounding rect calculated incorrectly if non-top aligned.Martin Jones2011-03-212-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QRect::setY() affects the size of the rectangle, so the height of the bounding rect was too small. Use moveTop() instead, which does not affect the size of the rectangle. Change-Id: If41ba6a28c9a7370f054dab20995a198f822ae2b Task-number: QTBUG-18194 Reviewed-by: Bea Lam
| | * | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-229-54/+163
| | |\ \ \
| | * \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-225-11/+36
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-225-11/+36
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed drawImage() not to attempt drawing null images on openvg. QS60Style: Update placeholder texture to real one
| | | | * | | Fixed drawImage() not to attempt drawing null images on openvg.Laszlo Agocs2011-03-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QVGPaintEngine did not have proper checks for null QImage in the drawImage functions so it went on trying to create a VGImage of size 0x0 which is bound to fail always. This resulted in confusing warnings about not being able to reclaim space for 0x0 images. Reviewed-by: Jani Hautakangas
| | | | * | | QS60Style: Update placeholder texture to real oneSami Merila2011-03-224-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once the background texture has been created, update it to all widgets. This corrects most cases where texture is used outside of QS60Style. It is still possible to access the placeholder texture and draw it, if: a) QPalette::Window is accessed before drawing even one widget b) Painting the texture happens without using QS60Style Task-number: QTBUG-14910 Reviewed-by: Laszlo Agocs
| | * | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-2244-402/+1755
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/positioners/layoutdirection/layoutdirection.qml src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-2222-46/+45
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Bump Qt version to 4.7.4 Fix endianness detection with gcc 4.6 -flto -fwhole-program remove redundand validateModes() call