summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Get qmldebugger running, and add basic object/property view.Michael Brasser2009-08-0411-307/+93
* DocumentationYann Bodson2009-08-016-25/+140
* Add CONSTANTYann Bodson2009-08-011-1/+1
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-3112-80/+18
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-07-314-15/+14
| |\
| * | Get rid of QFxItem::options.Michael Brasser2009-07-3112-80/+18
* | | Use new enum ints (should be ids!)Warwick Allison2009-07-314-8/+8
* | | Make QFxScaleGrid privateWarwick Allison2009-07-317-7/+7
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-315-21/+18
|\ \ | |/
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-07-3116-141/+250
| |\
| * | More QFxItem cleanup.Michael Brasser2009-07-315-21/+18
* | | Other minor API review changes.Warwick Allison2009-07-314-15/+14
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-312-5/+25
|\ \
| * | DocMartin Jones2009-07-311-0/+11
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-07-3118-77/+103
| |\ \ | | |/
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-07-311839-28386/+53511
| |\ \
| * | | Some pathview focus fixes.Martin Jones2009-07-311-5/+14
* | | | update for fa75cbdd3e1ae7b7d10d582498ae7e1d535f82ecWarwick Allison2009-07-311-2/+2
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-07-311846-28440/+53554
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-07-312-9/+16
| |\ \ \
| | * | | Fix compile breakage in 638fd43 by using QGraphicsItem::focusProxy().Andreas Aardal Hanssen2009-07-311-8/+16
| | * | | Remove unused include.Andreas Aardal Hanssen2009-07-311-1/+0
| | | |/ | | |/|
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-07-311-0/+0
| |\ \ \ | | |/ /
| | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-07-316-18/+69
| | |\ \
| | * | | Update windows configureAaron Kennedy2009-07-311-0/+0
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-07-314-18/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Add missing QDebug operator entry for ItemNegativeZStacksBehindParent.Andreas Aardal Hanssen2009-07-311-0/+3
| | * | | Remove unused functionality.Andreas Aardal Hanssen2009-07-313-18/+0
| * | | | Remove paintContents.Michael Brasser2009-07-3113-65/+61
| * | | | Add baselineOffset to anchors.Michael Brasser2009-07-314-3/+26
| |/ / /
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-07-311829-28343/+53380
| |\ \ \ | | |/ /
| | * | 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
| | | |\ \
| | | * | | 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
| | * | | | 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
| | | | * | | | Added the windowflags manualtest which is based on the windowflags example.Denis Dzyubenko2009-07-306-0/+662
| | | | * | | | Added an ability to remove size constraints from a widget.Denis Dzyubenko2009-07-301-6/+15