summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-05-183-17/+273
|\ | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qvariantanimation.cpp src/gui/graphicsview/qgraphicsitem.cpp
| * Update current value on QVariantAnimation::setKeyValuesLeonardo Sobral Cunha2009-05-151-0/+34
| | | | | | | | | | | | | | The current value was udpated on setKeyValueAt, but not on setKeyValues and this was leading to a semantic inconsistency. Reviewed-by: janarve
| * Avoid interpolating if we have less than 2 key values in QVariantAnimationLeonardo Sobral Cunha2009-05-151-0/+31
| | | | | | | | | | | | | | If we have less than 2 key values, we should neither try to interpolate nor set the current value. Reviewed-by: janarve
| * Indentation and whitespace fixes in animation apiLeonardo Sobral Cunha2009-05-151-2/+2
| |
| * Make QAbstractTransition::eventTest() non-constEskil Abrahamsen Blomfeldt2009-05-142-5/+5
| | | | | | | | | | We decided to remove the const of the eventTest() since some transitions have dynamic conditions and need to update when eventTest() is called.
| * correctly handle multiple event transitions for same (object,event)Kent Hansen2009-05-131-0/+48
| | | | | | | | | | | | The event filter was not removed at the right time. We now store the number of active event transitions for a particular (object,event) and only remove the filtering when the count drops to zero.
| * correctly handle multiple signal transitions for same (object,signal)Kent Hansen2009-05-121-0/+45
| | | | | | | | | | | | The signal was not disconnected at the right time. We now store the number of active signal transitions for a particular (object,signal) and only disconnect when the count drops to zero.
| * Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Alexis Menard2009-05-1212-1176/+1837
| |\ | | | | | | | | | | | | | | | | | | into kinetic-statemachine Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | * Don't interrupt test before animation finishesEskil Abrahamsen Blomfeldt2009-05-121-2/+4
| | | | | | | | | | | | | | | | | | | | | We're testing if both animations actually run and finish, so we need to make sure one of the polished signals is emitted last, and then react to this. I've done this by setting the duration of the animation which animated the property set by s2Child, so that it's sufficient to listen to this polished signal.
| | * Kill warning in removeDefaultAnimation() testEskil Abrahamsen Blomfeldt2009-05-121-2/+5
| | | | | | | | | | | | Warning about animating non-existent properties.
| | * Avoid warnings in assignPropertyWithAnimation testEskil Abrahamsen Blomfeldt2009-05-121-0/+8
| | | | | | | | | | | | | | | They added a warning when you animate a non-existent property, so we make sure the properties are defined.
| | * gracefully handle deletion of transition's target stateKent Hansen2009-05-081-0/+13
| | |
| | * Test what happens when target state doesn't have a parentKent Hansen2009-05-081-0/+25
| | |
| | * make sure connections and event filters are removed when state machine haltsKent Hansen2009-05-081-0/+4
| | |
| | * don't create transition to null stateKent Hansen2009-05-081-2/+23
| | |
| | * don't add signal transition if target is null or signal doesn't existKent Hansen2009-05-071-2/+21
| | |
| | * Make it impossible to have root state as source or target of transition or ↵Eskil Abrahamsen Blomfeldt2009-05-071-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as error state Since the root state has no ancestors, it cannot be source or target in transitions since there will be no LCA for the transition, which is required for the algorithm of enterStates and exitStates. In SCXML the root state cannot be target or source of a transition. By the same logic, it cannot be an error state. The root state will always have a valid machine, since it's added to a machine immediately, which makes this code possible.
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachineAlexis Menard2009-05-12287-2462/+6082
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
* | \ \ Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-1514-20/+1656
|\ \ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-153-0/+41
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Warwick Allison2009-05-1514-20/+1656
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/graphicsview/qgraphicsscene.cpp
| | * \ \ \ \ Merge branch '4.5'Thiago Macieira2009-05-142-2/+117
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| | | * | | | | QColor::toCmyk() does not convert the color if it is already in CMYKBenjamin Poulain2009-05-141-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QColor::toCmyk() converted the color to RGB and then to CMYK. If the color was already in CMYK, this conversion change it. The color is now returned directly if it is in CMYK Reviewed-by: Ariya Task-number: 253625
| | | * | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Andy2009-05-141-0/+110
| | | |\ \ \ \ \
| | | | * | | | | Fix QGraphicsItem::deviceTransform() to also work with normal items.Andreas Aardal Hanssen2009-05-141-0/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsItem::deviceTransform() returns the item-to-device transform, provided with the device-to-scene transform, and combining it with the item's scene transform. This function is meant to handle items that enable ItemIgnoresTransformations, but it happened to not work properly for items that _don't_ enable that flag. Unfortunately this bug is hard to work around for users from the outside, as it requires you to check if the item or any ancestor enables ItemIgnoresTransformations. The fix also removes unnecessary branchs inside QGV so that we use the same function for all items. Reviewed-by: bnilsen
| | | * | | | | | Prevent duplicate entries in the sidebar when the paths are the sameAndy2009-05-141-2/+7
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If two urls were added to the sidebar that only differed in how they referenced the added url (i.e. /foo/bar/. and /foo/bar) then only one entry should appear. Task-number: 253532 Reviewed-by: Alexis
| | * | | | | | QColor::toCmyk() does not convert the color if it is already in CMYKBenjamin Poulain2009-05-141-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QColor::toCmyk() converted the color to RGB and then to CMYK. If the color was already in CMYK, this conversion change it. The color is now returned directly if it is in CMYK Reviewed-by: Ariya Task-number: 253625
| | * | | | | | Fix missing update of edit geometry on QSpinBoxJens Bache-Wiig2009-05-141-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When showing or hiding spinbox buttons we did not update the child line edit geometry. This would on windows basically mean that the buttons would not show up as they were completely covered by the edit. Task-number: 235747 Reviewed-by: ogoffart
| | * | | | | | Fix sending of double-click events after explicit grab-ungrab.Andreas Aardal Hanssen2009-05-141-0/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug report came from the Declarative UI project as part of Kinetic. In FxFlickable the mouse is explicitly grabbed inside the mouse press event handler, and it's (explicitly) released in the release handler. When doing this, lastMouseGrabber is 0, and the double-click is delivered as a press. The fix is to not convert the double-click to a press if the receiver is the first and only mouse grabber (i.e., lastMouseGrabber is 0). The fix isn't entirely correct, as it can in theory allow an item to receive a double-click event as the first received event. This seems to only be possible in the case of using explicit mouse grabbing in combinations with the press and release event handlers so it's quite a corner case. Reviewed-by: Alexis
| | * | | | | | Merge branch 'master' of ../master into contiguouscacheIan Walters2009-05-1410-18/+947
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.5'Thiago Macieira2009-05-132-0/+73
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| | | | * | | | | Improve the HTTP status line parsing and catch more errors.Thiago Macieira2009-05-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need for using QByteArrayMatcher for one single character, so avoid the overhead. Also validate the message header a bit more: we require the status line to start with "HTTP/n.m " where n and m are positive integers less than 10. Task-number: 248838 Reviewed-by: Markus Goetz
| | | | * | | | | Fix handling of garbage data sent by the HTTP server instead of aThiago Macieira2009-05-131-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proper HTTP reply. If the server's reply doesn't start with "HTTP/", then the reply is not valid. This could happen if we connected via HTTP to an HTTPS server. It could also happen with an Icecast server (reply ICY/x.y). Task-number: 248838 Reviewed-by: Markus Goetz
| | | | * | | | | Reset the 'connectedToScene' flag when changing the scene of a viewLeonardo Sobral Cunha2009-05-131-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QGraphicsScene::_q_emitUpdated() the slot QGrpahicsView::updateScene(QList<QRectF>) gets connected and a boolean (connectedToScene) is set to prevent double connections. The problem is that this boolean was not reset when the view gets a new scene. Task-number: 253415 Reviewed-by: andreas
| | | * | | | | | QNAM: Upload architecture change: Auto testMarkus Goetz2009-05-131-16/+516
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago Macieira Reviewed-by: Peter Hartmann
| | | * | | | | | QRingBuffer: Enanced with readPointerAtPositionMarkus Goetz2009-05-133-0/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ability to read from a QRingBuffer at any position without modifying it.
| | | * | | | | | Merge commit 'origin/4.5'Olivier Goffart2009-05-132-2/+105
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Fixes a segfault from out of order cleanup of mysql resources.Bill King2009-05-131-2/+20
| | | | | |_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a QSqlQuery survived the lifetime of removal of a mysql db connection (that failed), the cleanup code would cause a segfault because it was using an out of date pointer that was pointing at memory that'd been freed by the removeDatabase() call. Revby: Justin McPherson Task-number: 205701
| | | | * | | | Fixed bug with Qt::WidgetWithChildren shortcut context in QGraphicsWidget.jasplin2009-05-121-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a QGraphicsWidget w, a shortcut with Qt::WidgetWithChildren context would trigger even if w did not have focus (provided no other widgets in the view had focus). Reviewed-by: andreas Task-number: 250119
| | | * | | | | QListView was assuming that selected indexes were always children ofThierry Bastian2009-05-121-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | their root. This can be different. ...especially if one manages the selection by program or if you share the selection model with a treeview. Task-number: 196118 Reviewed-by: ogoffart
| | * | | | | | Merge branch 'master' into contiguouscacheIan Walters2009-05-12256-2636/+6176
| | |\ \ \ \ \ \
| | * | | | | | | Various fixes resulting from QA code review.Ian Walters2009-05-122-30/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some documentation fixes. More clear handling of what is and isn't a valid indexes. Added functions for the 'really long lived circular buffer use case' Improved unit tests.
| | * | | | | | | Move qDebug code to correct locationIan Walters2009-04-081-24/+0
| | | | | | | | |
| | * | | | | | | Update licensing headers.Ian Walters2009-04-071-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update files to have consistent licencesing with the rest of Qt.
| | * | | | | | | Merge branch 'master' into contiguouscacheIan Walters2009-04-0687-705/+1886
| | |\ \ \ \ \ \ \
| | * | | | | | | | Rename OffsetVector to ContiguousCacheIan Walters2009-04-033-85/+85
| | | | | | | | | |
| | * | | | | | | | Squashed commit of the following:Rhys Weatherley2009-03-243-0/+370
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 39de3862f5678b3226b4932eeb342c4a023d2f2b Author: Ian Walters <ian.walters@nokia.com> Date: Thu Feb 19 14:16:05 2009 +1000 Fixes: Test runs (and passes), doc links. Task: QT-308 Details: Minor changes related to the code having moved. commit 5a8910dd1018fb228d0e2e2819ea429577bfa834 Author: Ian Walters <ian.walters@nokia.com> Date: Thu Feb 19 09:47:20 2009 +1000 Fixes: Checkin of QOffsetVector stuff for branch Task: QT-308 Details: Files originally from research/qcircularbuffer This checkin likely won't compile. Just a copy for now.
* | | | | | | | | | Add more resiliant TEST_FILE() methodAaron Kennedy2009-05-152-4/+25
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-151-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | | | Make test compile.Michael Brasser2009-05-151-0/+1
| | | | | | | | |