summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Qml Debugging: Only enable if explicitly requestedv4.7.1Jason McDonald2010-11-035-2/+23
| | | | | | | | | | | | | | | | | | | Enable the remote debugging of QDeclarativeEngines only after QDeclarativeDebugHelper::enableDebugging() has been called. Approved by 4.7 Program Team. Reviewed-by: Alessandro Portale Task-number: QTBUG-13762 (cherry picked from commit b2016bbfc9c7389e7b64451417395ceba96af21f) Conflicts: src/s60installs/bwins/QtDeclarativeu.def src/s60installs/eabi/QtDeclarativeu.def
* Update license headers to release version.Jason McDonald2010-10-181627-21193/+21193
|
* Adjust the parent index for the itemsMoved call.Stephen Kelly2010-10-152-0/+13
| | | | | | | | | | | | Not doing this causes the parent QModelIndexes to be out of sync with the model. The fix in fe350ca756df6392b3d0b7840351fccc89f9ef6f is extended to also use adjusted indexes in the itemMove call. Merge-request: 849 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> (cherry picked from commit 62dc9c9602987f4381481cc5642e3ea0782bb418)
* Avoid in-place convertion of images with multiple referencesBenjamin Poulain2010-10-101-1/+12
| | | | | | | | | | | | | | | | | The decoding from image reader was assuming the image reader do not keep the image internally. This is not true for the GIF plugins because the previous image can be used to compose the current image. This was causing crash on ARM because the 16 bits color depth causes the image memory to be reduce by half. When the plugin was accessing the memory, it assumes the images has not changed and is on 32 bits. This patch disable the in-place conversion if a detach is required. Regular conversion is the correct solution in this case, and it can also be made faster by converting while copying. Reviewed-by: Andreas Kling (cherry picked from commit 4d974ff0a748b22e668a4cb7ef38101122c85b3b)
* Add missing data for the autotest of in-place conversion for PixmapBenjamin Poulain2010-10-101-0/+0
| | | | | | The commit 4d974ff0a748b22e668a4cb7ef38101122c85b3b uses an new image which was not commited with the patch. (cherry picked from commit f0c1f381af7d6338ded9f65d00ed54b1b9405ba9)
* QGraphicsItem device coordinate cache unefficient in portrait modeBjørn Erik Nilsen2010-10-081-0/+76
| | | | | | | | | | | | | | Problem was that we always invalidated the cache whenever the item was rotated. This is however not required for simple rotations such as 90, 180 and 270 degrees. This commit also removes the somewhat arbitrary logic which takes the desktop size into account. We now use the viewport size instead. Auto test included. Task-number: QT-3779 Reviewed-by: yoann (cherry picked from commit e84ab1fee7f44a28ee82793f83b0b27d04d28c09)
* Ensure PathView updates positions when path changes.Michael Brasser2010-10-082-0/+36
| | | | | | | | Fixes regression caused by optimization added in commit 35a51442ed21f58c06b21293eeb56e843251ee82. Task-number: QTBUG-14239 Reviewed-by: Martin Jones
* Fix double painting when adding an item into a linear layoutThierry Bastian2010-10-041-0/+40
| | | | | | | | | | | the problem was that the item is first painted at its default position, then moved by the layout and finally repainted. We now made sure the item is laid out before the first paint event occurs. Task-number: QTBUG-13865 Reviewed-by: bnilsen (cherry picked from commit 33f525e636ef8fa64a15d3e66c56adaea0075bda)
* Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"Thierry Bastian2010-10-041-360/+4
| | | | | | | | | | | | This reverts commit 62b5ef3cc1306e46a4042b14867f2f92d9a110f3. The implementation of hfw from this patch is unfortunately not robust enough. It doesn't manage correctly the constraints on the layouts and the cell spans. It caused bad behaviour or regressions seen in tasks: QTBUG-13547, QTBUG-13067, QTBUG-13549, and more Reviewed-By: ogoffart (cherry picked from commit 5bd6f7eb5c7d87c08539b6c2df416990cc417ec7)
* QDeclarativeDebug: Make autotests more robustKai Koehne2010-10-042-13/+10
| | | | | | | | Always flush sockets after sending data, and make autotests more robust by using busy wait. Reviewed-by: Christiaan Janssen (cherry picked from commit cfe198948f1e4867918176df38b3e0b49757a4b8)
* QDeclarativeDebugClient: Make sure status is consistentKai Koehne2010-10-042-1/+7
| | | | | | | | | | When statusChanged() is called during handsake state() was not the same as the argument passed. Fix this by setting gotHello = true _before_ notifying the clients. Reviewed-by: Christiaan Janssen Task-number: QTBUG-14087 (cherry picked from commit a1f050fe4217d3a642ab7f4df8e50c21aa51689c)
* Make QmlDebug protocol more robustKai Koehne2010-10-045-69/+58
| | | | | | | | | | | | | | | | | | | | | | | The protocol so far was client->server only. That is, there was no sane way for a client to check whether a plugin on the server (service) was available or not. E.g. calling Client::setEnabled(true) 'succeeded', without a check whether there is actually a service to talk to. The new protocol replaces this shortcoming by a service discovery mechanism: Both client & service announce their available plugins at handshake time, and later on if there are changes. The status is reflected in Client::status() and Service::Status() , which are either NotConnected - no network connection, or not registered properly Unavailable - TCP/IP connection works, but no plugin with the same name on the other side Enabled - You can connect to plugin on other side The status changes happen automatically (no setEnabled() anymore). Furthermore a version ID was added to the handshake, so that we can extend the protocol further in the future :) (cherry picked from commit fd9771c29d401d88779ab7c5d7715c9ca41dd723)
* Autotest that new "import Qt 4.7"s aren't added accidentallyAaron Kennedy2010-10-011-0/+57
| | | | | Task-number: QTBUG-13799 (cherry picked from commit f7a439a0a00b0bdd6ebeff8bfd5ee2285eab1398)
* Replace "import Qt 4.7" with "import QtQuick 1.0"Aaron Kennedy2010-10-011-1/+1
| | | | | Task-number: QTBUG-13799 (cherry picked from commit 1f43e68c4ca5b28444b046deff1658b1b4b1923d)
* Add test for Qt 4.7 moduleAaron Kennedy2010-10-015-1/+183
| | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones (cherry picked from commit 6f35701275ab0cd80daec45b3407725b10571693)
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Jason McDonald2010-10-01748-1044/+1044
| | | | | | | | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones (cherry picked from commit 49452ad6b22e080b1dfdfde38c21c48bb910a1ae) Conflicts: tests/auto/declarative/qdeclarativeconnection/data/error-object.qml tests/auto/declarative/qdeclarativeconnection/data/error-property.qml tests/auto/declarative/qdeclarativeconnection/data/error-property2.qml tests/auto/declarative/qdeclarativeconnection/data/error-syntax.qml tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp tests/auto/declarative/qdeclarativeqt/data/quit.qml tests/auto/declarative/qdeclarativeview/data/error1.qml
* If a type is registered under several names, share the attached property objectAaron Kennedy2010-10-013-0/+28
| | | | | Task-number: QTBUG-13799 (cherry picked from commit 746954581f06e0bca98f25eb95dca09c663d47bf)
* Fixed compile error on non-Symbian platforms.axis2010-10-011-0/+2
| | | | (cherry picked from commit 3e3ce984b54a0b199bf5d4f5e3dcb0a9d5b5bd79)
* Fixed regression when typing in QTextControl based widgets on Symbianaxis2010-10-011-53/+204
| | | | | | | | | | The bug was that when querying for the maximum text length, the case where an invalid QVariant was returned (which is allowed) was not handled properly. This would lead to input being blocked by the input context when it shouldn't. RevBy: Sami Merila (cherry picked from commit 3bb3af84bef3c0472ca8ed0d5c6bb3c82320956d)
* QDeclarativeDebugService: Add bc autotestKai Koehne2010-10-013-2/+95
| | | | | | | Although it's a private header we use qdeclarativedebugservice_p.h in creator / qmljsdebugger library. Working with a copy of the header in the autotest hopefully catches some bc breakages. (cherry picked from commit 31dcf2b4028b1f76301fc69fccff0a9474a0a135)
* Fix crash when trying to append a null transform to QDeclarativeItem.Michael Brasser2010-10-012-0/+25
| | | | | Task-number: QTBUG-13893 (cherry picked from commit 085a121cb1ebba38d62c924500dbc71806b29b3c)
* Fixed floating point overflow issues in QRasterizer::rasterizeLineSamuel Rødal2010-09-291-1/+0
| | | | | | | | | | | | | | | | | | Change 7c673a4cf64ba04 introduced some autotest failures in the fpe_steepSlopes test in QPainter. Since the other rasterizers all deal in a 26.6 fixed point coordinate space we should snap the line vertices to this to prevent floating point overflows due to very steep slopes. This also necessitates keeping track of four different slope / inverse slope increments for each of the four edges. This also fixes a previously QEXPECT_FAIL'ed test case. Task-number: QTBUG-13429 Reviewed-by: Trond (cherry picked from commit 93199a5b7082fd484b7f21ad4825d71693ecead2)
* Fixed scaled point drawing with square cap in raster paint engine.Samuel Rødal2010-09-291-0/+22
| | | | | | | | | | | | With a large pen width and a small scale, due to the hacky way we draw points (stroking a line from (x, y) to (x + tiny_amount, y)), we some times end up snapping these two points to the same in rasterizeLine(). If we instead apply the SquareCap before we do clipping / snapping we don't get this problem. Task-number: QTBUG-13429 Reviewed-by: Trond (cherry picked from commit 7c673a4cf64ba043bb27f90287517bdcdd7a21db)
* Mitigate private header problems in QtCreator by adding semi-private APIKai Koehne2010-09-272-0/+89
| | | | | | | | | | | Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a private header, where we nevertheless can make some BC checks/guarantees. Aaron Kennedy agreed with the idea. Task-number: QTCREATORBUG-2179 (cherry picked from commit c1a7deedf1628e0dd3a5fbf92d97c4151d17fb5a)
* Mitigate private header problems in QtCreator by adding semi-private APIKai Koehne2010-09-273-0/+98
| | | | | | | | | | | Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a private header, where we nevertheless can make some BC checks/guarantees. Aaron Kennedy agreed with the idea. Task-number: QTCREATORBUG-2179 (cherry picked from commit 63c4c0449361ced03838e51d18e1113740f27fa9)
* QTreeView: do not scroll to top if last item is removedFrank Reininghaus2010-09-241-0/+22
| | | | | | | | | | | | | | When the last item is the current item and is removed, QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's viewItems member is cleared. This commit makes sure that viewItems is restored by calling QTreeView::doItemsLayout() in this case, preventing that the scroll bar range is set to zero temporarily and the view is scrolled to the top unexpectedly (this was a regression in 4.7.0: QTBUG-13567). Merge-request: 2481 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> (cherry picked from commit 6da6b7099d4e0b49329793e4b90703ec3d868048)
* Autotest and small fix for QDeclarativeFontLoader.Yann Bodson2010-09-232-0/+42
| | | | (cherry picked from commit eef26bc8521da62db0dced6796eceb7c27f64160)
* Fix a crash in QDeclarativeVisualDataModelJoona Petrell2010-09-232-0/+41
| | | | | | Task-number: QTBUG-13754 Reviewed-by: Martin Jones (cherry picked from commit 46e49547f8e4614cd504b0af0d52d4e2768b57c3)
* Make qml debugging work with command line argumentsLasse Holmstedt2010-09-233-6/+41
| | | | | | | | | | | The environment variables do not work for Symbian devices, so without this change, QML debugging cannot be done on them. In addition, configure now contains an option to disable qml debugging entirely, due to it being a major security risk. Reviewed-by: kkoehne (cherry picked from commit a9e5329168cd9113bf41293c05193d8b099494c6)
* Bump version to 4.7.1.Jason McDonald2010-09-225-5/+5
| | | | | Reviewed-by: Trust Me (cherry picked from commit 63394650e71f23a036edbc0df29a1b6b19366269)
* Improve error messagesBea Lam2010-09-221-4/+4
| | | | (cherry picked from commit af29c555a29ebcdb1d962176912478212c9c7e65)
* Changes to objects returned from get() should emit itemsChanged() soBea Lam2010-09-221-20/+287
| | | | | | | | | | | | that the view is updated (currently the model data changes but the view does not). In flat-model mode, get() now returns a QScriptClass-type object so that changes to the returned object are received, and for nested-model mode, the fix adds a QDeclarativeOpenMetaObject subclass and ModelNode::listIndex so that itemsChanged() can be emitted when the node data changes. Task-number: QTBUG-12363 (cherry picked from commit c2bbef949126826f0330c69dff1a8c96919f69a5)
* Moving items in a PathView caused PathView.onPath to be set to false.Martin Jones2010-09-212-8/+16
| | | | | | | | | Check that we no longer hold a reference to the item before setting onPath to false. Task-number: QTBUG-13689 Reviewed-by: Michael Brasser (cherry picked from commit 7e6b2b2b95bc1db77544b898ec45ea4a2683e435)
* Fixed infinite loop when loading jpeg without EOI from memory.Kim Motoyoshi Kalland2010-09-213-0/+6
| | | | | | Task-number: QTBUG-13653 Reviewed-by: aavit (cherry picked from commit 5220c371176951e12d525ac7908861d111c367d0)
* Added autotest for QPixmap::size() with null pixmaps.Samuel Rødal2010-09-171-0/+5
| | | | | | For change 82575a9f6123eed3e858 which fixed a behavioural regression. Reviewed-by: Olivier Goffart
* QGraphicsItem::childrenBoundingRect behavior breaks ↵Bjørn Erik Nilsen2010-09-161-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsEffect::sourceBoundingRect(). Context: QGraphicsEffect::sourceBoundingRect() returns: item->boundingRect() | item->childrenBoundingRect(); Problem was that item->childrenBoundingRect() adjusted the children's bounding rect with the children's ancestor effects (child -> root item), which means the source bounding rect was bigger than needed. We should only account for effects downwards in the hierarchy. root (has effect) | item (has effect) | child | grandChild Auto test included. Task-number: QT-3633, QT-3828 Reviewed-by: samuel
* Wrong bounding rect returned by QGraphicsEffect::boundingRect().Bjørn Erik Nilsen2010-09-161-0/+26
| | | | | | | | | | | | | | Regression after: f5c5e20a Problem was that the cached bounding rect was never invalidated. We can also remove the cached bounding rect in QGraphicsEffectSource because QGraphicsItem::childrenBoundingRect now clips by default. This basically means partially reverting above commit and invalidate whenever ItemClipsChildrenToShape flag changes. Auto test included. Task-number: Discovered while investigating QT-3633 Reviewed-by: samuel
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-162-7/+101
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed regression in QPixmap::size() for null pixmaps. Make test less sensitive to platform specifics Doc: Further QML improvements. Doc: Minor improvements to QML-related documentation. The test livelock of QTimer is now expected to work Make sure mapSelectionFromSource does not return a selection with invalid ranges. QEventDispatcherUnix: do not process too many timer if other events need to be processed first Doc: Continued work on the QML documentation. Doc: More work on the QML documentation. Doc: More work on the declarative API documentation. Doc: Some editing and tidying up. Doc: Added a missing file. Doc: Fixed text in license headers.
| * Make test less sensitive to platform specificsBradley T. Hughes2010-09-161-1/+1
| | | | | | | | | | | | | | | | Zero timers on Windows are implemented using posted events, as are QueuedConnections, making the QTBUG13633_dontBlockEvents test sensitive to the order between invokeMethod() and starting a zero timer. Reviewed-by: Olivier
| * The test livelock of QTimer is now expected to workBenjamin Poulain2010-09-151-4/+1
| | | | | | | | | | | | | | Following the patch e3801c20bd3626c3c9c9fac110ee2f9e4269e3c8 of Olivier, this test is working for Mac as well. Reviewed-by: Olivier Goffart
| * Make sure mapSelectionFromSource does not return a selection with invalid ↵Stephen Kelly2010-09-151-0/+39
| | | | | | | | | | | | | | | | | | ranges. Similar for mapSelectionToSource, but that one could possibly be an assert instead. Merge-request: 2474 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * QEventDispatcherUnix: do not process too many timer if other events need to ↵Olivier Goffart2010-09-151-3/+61
| | | | | | | | | | | | | | be processed first Task-number: QTBUG-13633 Reviewed-by: Brad
* | Models with a single role may not update due to "modelData" conflict.Martin Jones2010-09-163-0/+104
| | | | | | | | | | | | | | | | | | Models with a single role also have a modelData property added. These role names both ended up in a hash, resulting in only one or the other updating. Now we handle modelData specially. Task-number: QTBUG-13664 Reviewed-by: Michael Brasser
* | Fix test.Michael Brasser2010-09-161-2/+0
| |
* | Restore any absolute geometry changed by AnchorChanges when returningMichael Brasser2010-09-152-0/+52
| | | | | | | | | | | | to the base state. Task-number: QTBUG-11834
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-142-0/+166
|\ \ | |/ |/| | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Export QDeclarativeScriptAction Completing the interface for children/data/resources Unit tests for Bauhaus enablers This patch allows modifications on PropertyChanges on the fly
| * Unit tests for Bauhaus enablersThomas Hartmann2010-09-142-0/+166
| | | | | | | | See 6454f4db1697af1d36ad4c0ea83ccd0bb490fd39
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-141-0/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix QTBUG-13501 - crash when a gesture is accepted but not consumed Add test: assert when gesture is never accepted.
| * | Add test: assert when gesture is never accepted.Frederik Gladhorn2010-09-141-0/+26
| |/ | | | | | | Test for Qt-Bug 13501.
* | QGraphicsWidget update issues with ItemHasNoContents + effectBjørn Erik Nilsen2010-09-141-0/+29
|/ | | | | | | | | | | Items with the ItemHasNoContents flag set are never drawn so the 'paintedViewBoundingRect' is never cached/updated resulting in updates wrongly being discarded. The solution is to always invalidate the children for such items. Auto test included. Task-number: QT-3803