summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into QTBUG-15333Jan-Arve Sæther2010-11-19431-13295/+10344
|\
| * Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-1816-581/+557
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-1815-564/+540
| | |\ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fine-tune the tests being run on the CI system. Standardize selection color in visual test
| | | * Fine-tune the tests being run on the CI system.Alan Alpert2010-11-181-36/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to bother running tests on QWS, or text tests on X11 until they update the ubuntu version. Task-number: QTBUG-14792
| | | * Standardize selection color in visual testAlan Alpert2010-11-1814-528/+530
| | | | | | | | | | | | | | | | Task-number: QTBUG-14792
| | * | tst_qnetworkreply: Fix ugly testMarkus Goetz2010-11-171-17/+17
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Properly use the event loop. Signals have to be connected directly after using the get() method of QNetworkAccessManager. Else they might have already been emitted while the event loop was spinning. Reviewed-by: Peter Hartmann
| * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-17381-12037/+9018
| |\ \ | | |/
| | * Remove pointSize from visual testsAlan Alpert2010-11-173-2/+2
| | | | | | | | | | | | | | | | | | Too unstable Task-number: QTBUG-14792
| | * Update visuals for X11Alan Alpert2010-11-1741-1404/+1404
| | | | | | | | | | | | | | | | | | | | | | | | Text visual tests may be dependant on the specific version of libfreetype. Comparison images have been regenerated with the specific version that the test machines use. Task-number: QTBUG-14792
| | * Remove some excess pngsAlan Alpert2010-11-1615-0/+0
| | | | | | | | | | | | | | | | | | These are no longer used by these tests Task-number: QTBUG-14792
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-164-2/+50
| | |\
| | | * VisualDataModel::count should be 0 until a valid delegate is set.Martin Jones2010-11-161-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no visual items if there is no delegate. Task-number: QTBUG-14781 Reviewed-by: Robert Griebl
| | * | Update qml visual testsAlan Alpert2010-11-16358-11891/+8848
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added guidelines for size, and shrunk tests that exceeded them. Also updated the visuals for all text tests now that antialiasing is off Also some other minor cleanups. Also had to update the visuals for all tests, due to the bug in generating the test scripts being fixed (all need to be remade). Task-number: QTBUG-14792
| | * | Turn off font antialiasing during tests.Alan Alpert2010-11-165-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Font antialiasing varies from machine to machine, and so is too unstable Also switching to a monospaced font in visual tests to attempt to pre-empt another possible source of instability. This commit also slightly increases verbosity of test failure messages to be more useful in the CI system Task-number: QTBUG-14792
| | * | Shrink size of a visual testAlan Alpert2010-11-163-110/+110
| | | | | | | | | | | | | | | | Task-number: QTBUG-14792
| * | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-15145-1363/+1455
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-151-1/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed QGesture autotest for QGesture lazy deletion. Crash fix, when the Object will be deleted during handling a QGestureEvent.
| | | * | Fixed QGesture autotest for QGesture lazy deletion.Dominik Holland2010-11-151-1/+3
| | | | | | | | | | | | | | | | | | | | Reviewed By: Trust Me
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-152-1/+23
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits) compile with quintptr instead of intptr_t Enable OpenGL scissors test Remove -fno-omit-frame-pointer and -fno-optimize-sibling-calls in mkspecs, add -Wno-psabi Fix for E32User-CBASE 46 Panic when using CActiveSchedulerWait QNAM HTTP: Ignore double content-length headers Don't pack Harfbuzz structs, this causes unaligned access crashes. qmake vcxproj generator: fix description of custom build tools Fix for KERN-EXEC 0 caused by QNetworkAccessManager::get Minor adjustments to merge-request 915 Implement brush transformations for directfb. Add FreeBSD's certificate bundle to the certificates list. SSL internals: upon error, read all errors from OpenSSL Added an example for QTest::touchEvent to the documentation. Push and pop the thread-default context for the current thread Fix compilation by s/intptr_t/quintptr/ qmake vcxproj generator: fix description of custom build tools Minor adjustments to merge-request 915 Implement brush transformations for directfb. Add FreeBSD's certificate bundle to the certificates list. SSL internals: upon error, read all errors from OpenSSL ...
| | | * | compile with quintptr instead of intptr_tThiago Macieira2010-11-151-1/+1
| | | | |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-151-0/+22
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: Ignore double content-length headers Don't pack Harfbuzz structs, this causes unaligned access crashes. qmake vcxproj generator: fix description of custom build tools Minor adjustments to merge-request 915 Implement brush transformations for directfb. Add FreeBSD's certificate bundle to the certificates list. SSL internals: upon error, read all errors from OpenSSL Added an example for QTest::touchEvent to the documentation. Push and pop the thread-default context for the current thread Fix compilation by s/intptr_t/quintptr/
| | | | * QNAM HTTP: Ignore double content-length headersMarkus Goetz2010-11-131-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15311 Reviewed-by: ogoffart
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-152-0/+62
| | |\ \ \
| | | * | | ListView: items with size < 1.0 were layed out incorrectly.Martin Jones2010-11-152-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the size of an item was less than one its endPosition() was less than its position(), which caused incorrect layout (overlapping items). Task-number: QTBUG-15242 Reviewed-by: Yann Bodson
| | * | | | Update all qmlvisual testsAlan Alpert2010-11-15128-1052/+1052
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous commit means that the snapshots are in different frames. All tests must be updated. Task-number: QTBUG-14792
| | * | | | Stabilize visual test focusscope/test3.qmlAlan Alpert2010-11-156-273/+272
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Colored rects are better than text. At least here. Task-number: QTBUG-14792
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-152-2/+2
| | |\ \ \
| | | * | | Remove unneeded semicolons.Martin Jones2010-11-152-2/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extra semicolons break building with sun studio. Task-number: QTBUG-15326 Reviewed-by: Alan Alpert
| | * | | Fix failing visual testsAlan Alpert2010-11-156-35/+42
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | One case of non-standardized text, and one case of what is presumably random number generation. Task-number: QTBUG-14792
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2010-11-111-0/+12
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Doc: Fixing typo Fix auto-test regression in tst_QDoubleValidator QS60Style: Color calculation should be optimized QS60Style: Color calculation should be optimized With some locales, QDoubleValidator would not accept "C" locale valid numbers
* | | | Improve performance of hfw in qgridlayoutengine by adding more caching.Jan-Arve Sæther2010-11-192-0/+139
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code tried to do caching of queries with constraints too, but it's usecase was rather limited. The caching worked for the simple case of effectiveSizeHint(Qt::PreferredSize, QSize(10, -1)); effectiveSizeHint(Qt::PreferredSize, QSize(10, -1)); // uses cache The problem was that if somebody called this sequence: effectiveSizeHint(Qt::PreferredSize, QSize(10, -1)); effectiveSizeHint(Qt::PreferredSize, QSize(-1, -1)); effectiveSizeHint(Qt::PreferredSize, QSize(10, -1)); Each call would disregard the cache because the constraint was different. Now the pattern is used in the qgridlayoutengine itself when we calculate hfw: (yes, height-for-width). First, we ask for the horizontal size hints with no constraints. Then, we'll ask for the vertical size hints with constraints. Since horizontal and vertical ultimately comes from the same function (effectiveSizeHint) it will invalidate the cache each time. The solution is to add another cache for the sizeHints with constraints. The most notable improvement is in the hfw, nested case. Result: RESULT : tst_QGraphicsLinearLayout::heightForWidth():"hfw, nested": 546 msecs per iteration (total: 546, iterations: 1) RESULT : tst_QGraphicsLinearLayout::heightForWidth():"hfw, nested": 0.000029 msecs per iteration (total: 62, iterations: 2097152) Improvement: 18,827,586 times faster (!!)
* | | Adhere to code styleJan-Arve Sæther2010-11-152-5/+5
| | |
* | | Change the QGraphics*Layout documentation to match the code - that the ↵John Tapsell2010-11-152-2/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default alignment is top-left. This includes unit tests to confirm that the alignment is top-left in a variety of different cases. Merge-request: 894 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* | | Fix item alignment in layouts bigger than the items thay they containJohn Tapsell2010-11-152-9/+146
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13551 Task-number: QTBUG-7756 Merge-request: 894 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* | | Add autotest to test a issue with stretches and preferred width.Jan-Arve Sæther2010-11-151-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue seemed to claim that the preferred size was not respected when there was another item that could stretch along the same axis: "A widget with a horizontal stretch next to it should get its preferredWidth()". This seems to works as expected, so nothing to fix. Task-number: QTBUG-12835
* | | Merge branch 'fixes-to-merge-requests' into 4.7Jan-Arve Sæther2010-11-121-7/+186
|\ \ \
| * | | Add back the tests that were removed by commit ↵Jan-Arve Sæther2010-11-121-0/+174
| | | | | | | | | | | | | | | | | | | | | | | | fcda1b785bd7d86011f49bfe96cb22b04202933f Also add a proper test for the alignment problem
| * | | Fix a behaviour change of sizeHint() introduced by 6d4d265e7e67dde58Jan-Arve Sæther2010-11-111-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 6d4d265e7e67dde58e45d7d89f4974d0bd8b70e4 added a behaviour change in the cases if there was an item with height-for-width and sizeHint() was called with no constraint. The commit tried to return the height needed for the preferred width, but it still did not satisfy the constraints, since the width used as the constraint could be less than the preferred width. This also meant that the sizeHint(Qt::MinimumSize) could actually be larger than the smallest possible size. The behaviour should be that it should return the smallest width possible regardless of height. For instance, for a label it could return the size of the longest word (to avoid hyphenation issues). The same logic applies for the height: It should return the smallest height possible regardless of width. For instance, for a label it could then return the height of the font. I also had to fix some stuff in the heightForWidthWithSpanning() autotest since it wrongly expected the maximum size to be QWIDGETSIZE_MAX in several of the cases. However, that is the current behaviour (and it is a bug), but it is unrelated to the problem with spans so I simply fix the test and mark them with QEXPECT_FAIL. Reviewed-by: John Tapsell
* | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-118-17/+56
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-111-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: SSL: Fix for capabilities in QSslCertificate auto test Doc: update symbian capabilities regarding SSL SSL: Fix crashes/hangs when retrieving CA certificates
| | * | | SSL: Fix for capabilities in QSslCertificate auto testShane Kearns2010-11-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were in wrong section of the file due to editing error and therefore ignored. Reviewed-by: Markus Goetz
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-117-16/+54
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: remove pointless assignment of deprecated variable fix tst_headers Fixed a shell syntax error in configure Clear X11 structure before use Make operator QRectF const Fix GC-related crash in QScriptValue::setData() get rid of dependency on QtGui Removed implicity QtGui linking from icd.pro as it is not needed. DFB: Make sure QPixmap::hasAlpha is respected fix build on mingw Fix some painting issues in QDirectFBPaintEngine QNAM: Do not need QNetworkSession in AlwaysCache load mode Don't crash if QScriptClass property getter returns an invalid value QNAM: Remove dead waitForUpstreamBytesWritten() code QNAM: Remove dead waitForDownstreamReadyRead() code fix memleak in test
| | * | | fix tst_headersHarald Fernengel2010-11-102-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Fix the generator and the generated file to ensure that the string "generated" appears in the first line.
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-107-15/+51
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Clear X11 structure before use Make operator QRectF const Fix GC-related crash in QScriptValue::setData() get rid of dependency on QtGui Removed implicity QtGui linking from icd.pro as it is not needed. DFB: Make sure QPixmap::hasAlpha is respected fix build on mingw Fix some painting issues in QDirectFBPaintEngine QNAM: Do not need QNetworkSession in AlwaysCache load mode Don't crash if QScriptClass property getter returns an invalid value QNAM: Remove dead waitForUpstreamBytesWritten() code QNAM: Remove dead waitForDownstreamReadyRead() code fix memleak in test
| | | * | | Fix GC-related crash in QScriptValue::setData()Kent Hansen2010-11-092-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yet another missing API shim. When converting the QScriptValue to JSC, a JSCell may be allocated, which can cause the GC to trigger. If an identifier (JSC::Identifier) is then garbage collected, the destructor will try to remove itself from the currentIdentifierTable(). Because the API shim was missing, the identifier table was 0. It's difficult to create a bulletproof test for this case, but the attached test is a best effort (it crashes on my machine without the fix). Task-number: QTBUG-15144 Reviewed-by: Jedrzej Nowacki
| | | * | | fix build on mingwKonstantin Ritt2010-11-083-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > data.cpp:2: error: 'ushort' does not name a type > data.cpp:1133: error: 'ushort' does not name a type and lot of > data.cpp:1276: error: too many initializers for 'StringCollection' when the issue with ushort is fixed (by including qglobal.h, for example) a bunch of some new build errors occurs: > data.cpp:4: error: 'stringCollectionData' was declared 'extern' and later 'static' > data.h:54: error: previous declaration of 'stringCollectionData' > data.cpp:1131: error: redefinition of 'struct StringCollection' > data.h:48: error: previous definition of 'struct StringCollection' > data.cpp:1136: error: invalid type in declaration before '=' token > data.cpp:1136: error: conflicting declaration 'int stringCollection []' > data.h:55: error: 'stringCollection' has a previous declaration as 'StringCollection stringCollection [] > data.cpp:1279: error: 'stringCollectionCount' was declared 'extern' and later 'static' > data.h:56: error: previous declaration of 'stringCollectionCount' Merge-request: 910 Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com>
| | | * | | Don't crash if QScriptClass property getter returns an invalid valueKent Hansen2010-11-081-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible that a class claims to have a property of a given name (i.e. queryProperty() returns true), but returns an invalid value for that property. In that case we should silently convert the value to undefined, otherwise the value may wreak havoc in JS. This is a regression from Qt 4.5 (pre-JavaScriptCore-based), which had this check. Task-number: QTBUG-15079 Reviewed-by: Jedrzej Nowacki
| | | * | | fix memleak in testHarald Fernengel2010-11-081-0/+1
| | | | | |
* | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-10163-3714/+7917
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-105-24/+310
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits) Fixed tst_qpixmap::grabWidget autotest failure on QWS. Doc: Fixing typo Doc: Fixing typo Doc: Fixing typo Fixed tst_qwidget::testContentsPropagation auto-test failure. Fixed text rendering bug in raster engine when opacity != 1.0. Prevented race condition on texture destruction. More fix for QTBUG-14640:oci performance problem with qlonglong Doc: Fixing typo Fixed grabWidget sometimes returning uninitialized memory. Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout ...