summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove API for setting specific restore policies on states. We have no clearEskil Abrahamsen Blomfeldt2009-04-239-133/+73
| | | | | | use case for this, so it has been removed. If the requirement arises we can add it back in later. Since it no longer makes sense to have it in QAbstractState, the RestorePolicy enum has been moved to QStateMachine.
* Compile.Eskil Abrahamsen Blomfeldt2009-04-231-2/+0
|
* Remove specific RestorePolicy per state from example. The semantics for thisEskil Abrahamsen Blomfeldt2009-04-233-15/+0
| | | | | have changed to something which is more intuitive, so it is no longer useful for this case.
* kill the stateactions apiKent Hansen2009-04-2236-1720/+148
| | | | | | | | | | | | It just didn't give us that much. Typically you just reimplement onEntry/onExit/onTransition when you want to do something. We go back to the signals-and-slots approach: states have entered() and exited() signals that you can connect to. It's still possible to have an action-based API, but then you build it on top of the core API, which is OK. Replacing 4 public classes (and one layer in the hierarchy) with 2 signals feels good.
* Test for overriding default animations. This test defines the order ofEskil Abrahamsen Blomfeldt2009-04-221-0/+247
| | | | | | | | | precedence: 1. Specific animation for transition 2. Default animation for source state 3. Default animation for target state 4. Default animation
* Add tests for the removeDefaultAnimation* APIEskil Abrahamsen Blomfeldt2009-04-221-0/+127
|
* Add API for adding default animations to the state machine. This is especiallyEskil Abrahamsen Blomfeldt2009-04-214-4/+272
| | | | | | | useful when using the RestoreProperties policy, because this is intended to allow you to build a state machine without having each state consider all the possible properties that may be set by some state at some point. Default animations provide the same convenience for animated properties.
* QAnimationState is no more, so we remove the test for it. The relevant testsEskil Abrahamsen Blomfeldt2009-04-213-630/+327
| | | | have been ported to the new API and added to the QStateMachine autotest instead.
* doc: Document return value of QState::addTransition(QAbstractTransition*)Eskil Abrahamsen Blomfeldt2009-04-211-1/+2
|
* Have QState::addTransition(QAbstractTransition*) return the transition objectEskil Abrahamsen Blomfeldt2009-04-212-5/+6
| | | | | | | | | when it is added. Reduces the number of temporary variables you have to declare in your code since you can do things like: state->addTransition(new Transition())->addAnimation(new Animation()); Could also be used for error checking.
* compile.Eskil Abrahamsen Blomfeldt2009-04-211-3/+3
|
* Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-212-1/+36
|\
| * Fixes bug when adding the same child animation twice to the same groupLeonardo Sobral Cunha2009-04-212-1/+36
| | | | | | | | | | | | | | | | The child animation was removed twice from the group because in QAnimationGroup::insertAnimationAt the insertion in the list was done before removing the animation. Reviewed-by: Jan-Arve
* | include the right headerKent Hansen2009-04-212-2/+2
| |
* | compileEskil B2009-04-211-63/+48
| |
* | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-2127-782/+233
|\ \ | |/
| * don't assert if the signal is not validKent Hansen2009-04-211-1/+2
| |
| * compile fixThierry Bastian2009-04-201-1/+1
| |
| * remove QItemAnimation and add the interpolator for QColorThierry Bastian2009-04-207-511/+29
| |
| * cleanup in demoThierry Bastian2009-04-205-96/+30
| | | | | | | | sub-attaq doesn't use anymore animation private headers
| * iterationCount becomes loopCount againThierry Bastian2009-04-2016-176/+175
| |
* | compileKent Hansen2009-04-211-34/+34
| |
* | rename QTransition -> QActionTransitionKent Hansen2009-04-2113-87/+88
| |
* | don't assert if the signal is not validKent Hansen2009-04-211-1/+2
| |
* | initialize "for-future-expansion"-pointerKent Hansen2009-04-201-1/+1
|/
* Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-201-3/+4
|\
| * Fix compilation after a merge errorAlexis Menard2009-04-171-3/+4
| |
* | docKent Hansen2009-04-2013-6/+25
| |
* | more docKent Hansen2009-04-173-8/+12
| |
* | docKent Hansen2009-04-174-4/+5
| |
* | compileKent Hansen2009-04-171-0/+2
| |
* | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-17971-37275/+18765
|\ \ | |/
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-04-17971-37275/+18765
| |\ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | * Even more cleanups on the Change Log.Kavindra Devi Palaraja2009-04-171-165/+185
| | | | | | | | | | | | | | | Reviewed-by: TrustMe BT: Yes
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Kavindra Devi Palaraja2009-04-177-178/+11
| | |\
| | | * Fix obsolete version number in docs.Jason McDonald2009-04-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace with %VERSION%, so we don't need to fix this for every release. Task-number: 251417 Reviewed-by: Trust Me
| | | * Fix obsolete version number in docs.Jason McDonald2009-04-171-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use %VERSION% so that we don't have to fix this for every release. Task-number: 251418 Reviewed-by: Trust Me
| | | * Wrong version number in windows installation doc.Jason McDonald2009-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc still referred to 4.4.0-rc1 - replace with %VERSION% so we don't have to keep updating this. Task-number: 251419 Reviewed-by: Trust Me
| | | * Remove out-of-date Cocoa known issues page.Jason McDonald2009-04-171-168/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This page is not linked from anywhere, and its content is horribly out-of-date. Task-number: 251420 Reviewed-by: nrc
| | | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-04-171-1/+4
| | | |\
| | | | * Line edit displays garbage when pressing up or down arrow keys (Cocoa).Prasanth Ullattil2009-04-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unicode characters between 0xF700 & 0xF8FF are special function-key code characters used by the NSEvent. These characters have to be ignored when converting to a QString. Task-number:244486 Reviewed-by:nrc
| | | * | Fix incorrect year and version number in assistant docs.Jason McDonald2009-04-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Task: 251421 Reviewed-by: Trust Me
| | | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-04-179-21/+42
| | | |\ \ | | | | |/
| | | * | BT: Fix version number in FAQ.txt.Jason McDonald2009-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't state a specific version number, or we'll keep forgetting to update it. Task-number: 251338 Reviewed-by: Trust Me
| | * | | More cleanups on the change log.Kavindra Devi Palaraja2009-04-171-90/+105
| | | |/ | | |/| | | | | | | | | | | | | Reviewed-by: TrustMe BT: Yes
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-04-175-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 450331808bfe11b1472c213a8cb311190355c2de ) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-02-04 Simon Hausmann <simon.hausmann@nokia.com> Unreviewed Qt build fix. Changed ASSERT(image) to ASSERT(!image.isNull()). * platform/graphics/qt/ImageBufferQt.cpp: (WebCore::ImageBuffer::getImageData): ++ b/WebKit/qt/ChangeLog 2009-03-07 Adam Treat <adam.treat@torchmobile.com> Reviewed by Cameron Zwarich. These methods are clearly returning the wrong values as the two were returning swapped information. * Api/qwebpage.cpp: (QWebPage::totalBytes): (QWebPage::bytesReceived):
| | * | Add my bugfix.Ariya Hidayat2009-04-171-0/+1
| | | |
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jarek Kobus2009-04-17210-2891/+3388
| | |\ \ | | | |/
| | | * Allow -help to be used in a non-eval package.Lincoln Ramsay2009-04-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous logic caused a license check when the eval license file was missing. Reviewed-by: Jason McDonald Task-number: 251339
| | | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Rhys Weatherley2009-04-171-5/+4
| | | |\