summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-07-31102-2723/+1259
|\
| * Docs: Make precedence clear.Michael Brasser2009-07-311-0/+4
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-07-319-145/+404
| |\
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-07-311-0/+1
| | |\
| | | * Fixed AST visiting, so UiProgram *members* are visited again.Erik Verbruggen2009-07-301-0/+1
| | * | QmlFontFamily improvementsYann Bodson2009-07-312-11/+32
| | * | DocsYann Bodson2009-07-312-14/+30
| | |/
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-07-308-139/+347
| | |\
| | | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-3021-168/+96
| | | |\
| | | * | Video size and aspect ratio.Warwick Allison2009-07-303-118/+326
| | * | | Don't bounce around when removing the current item.Martin Jones2009-07-301-2/+15
| * | | | Rename Rect.pen to Rect.borderMichael Brasser2009-07-3123-85/+48
| * | | | Rename centeredIn to centerIn.Michael Brasser2009-07-3123-56/+56
| * | | | More QFxItem cleanup.Michael Brasser2009-07-314-29/+13
| * | | | Introduce Loader item.Michael Brasser2009-07-3017-205/+403
| * | | | More QFxItem cleanup.Michael Brasser2009-07-303-46/+0
| | |_|/ | |/| |
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-07-301-7/+9
| |\ \ \ | | |/ /
| | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-07-3018-123/+62
| | |\ \
| | * | | maxYExtent() should never be greater than minYExtent()Martin Jones2009-07-301-7/+9
| * | | | More QFxItem cleanup.Michael Brasser2009-07-305-21/+21
| | |/ / | |/| |
| * | | Move paint margin functionality to QFxRect.Michael Brasser2009-07-306-21/+24
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-07-306-1838/+147
| |\ \ \ | | |/ /
| | * | Removed unused code.Martin Jones2009-07-301-13/+0
| | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-07-305-1821/+143
| | |\ \ | | | |/
| | | * Removed the (outdated) pretty printer for the JS expressions.Roberto Raggi2009-07-303-1666/+1
| | | * Improved the support for post-visits of the AST.Roberto Raggi2009-07-302-155/+142
| | * | Don't disconnect item size connections if the item is referenced.Martin Jones2009-07-301-4/+4
| | |/
| * | More QFxItem cleanup.Michael Brasser2009-07-3014-61/+21
| * | More QFxItem cleanup.Michael Brasser2009-07-304-41/+17
| |/
| * Fix regression introduced in classComplete -> componentComplete.Michael Brasser2009-07-291-12/+12
| * Partially revert ef0f2901d4055bf53ac2bebb7fe2d5681900db19.Michael Brasser2009-07-293-8/+8
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-07-2915-35/+149
| |\
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-2914-32/+146
| | |\
| | | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-07-293-22/+27
| | | |\
| | | | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-07-298-7/+116
| | | | |\
| | | | * | Make SameGame ScalableAlan Alpert2009-07-292-10/+7
| | | | * | Fix layout sizingAlan Alpert2009-07-291-12/+20
| | | * | | KeyActions::return -> KeyActions::keyReturnYann Bodson2009-07-293-3/+3
| | | | |/ | | | |/|
| | * | | Some useful ffmpeg quality setttings.Warwick Allison2009-07-291-3/+3
| | | |/ | | |/|
| * | | QFxItem cleanup.Michael Brasser2009-07-297-29/+36
| * | | Get rid of classComplete.Michael Brasser2009-07-2921-116/+28
| |/ /
* | | Manual sync with masterAaron Kennedy2009-07-312-8/+2
* | | Merge branch 'master' of ../../qt into kinetic-declarativeuiAaron Kennedy2009-07-31143-3466/+4570
|\ \ \
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtAaron Kennedy2009-07-31139-3451/+4562
| |\ \ \
| | * | | Fixed corrupt testlogs on Windows and other places where vsnprintf isRohan McGovern2009-07-311-3/+4
| | * | | Docs: Improve QGraphicsTransform and subclassesAndreas Aardal Hanssen2009-07-315-191/+327
| | * | | API documentation moved into the classes subdirectoryVolker Hilsheimer2009-07-301-0/+0
| | * | | Doc: there is no group of explicitly shared classes, only one class uses this.Volker Hilsheimer2009-07-304-116/+156
| | * | | Disabling the close button didn't work correctlyDenis Dzyubenko2009-07-301-10/+11
| | * | | Allow maximize button on the titlebar for a fixed size windowDenis Dzyubenko2009-07-301-0/+5