Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 1 | -0/+7 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-10 | 1 | -0/+7 |
| |\ | |||||
| | * | Remove hacky fix (breaks autotest). | Michael Brasser | 2010-02-05 | 1 | -1/+0 |
| | * | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso... | Warwick Allison | 2010-02-04 | 1 | -0/+8 |
| | |\ | |||||
| | | * | Add bug note. | Michael Brasser | 2010-02-04 | 1 | -1/+1 |
| | | * | Fix compile on visual, changed NaN checks to use qIsNaN instead of isnan. | Joona Petrell | 2010-02-03 | 1 | -2/+3 |
| | | * | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-02-02 | 3 | -12/+31 |
| | | |\ | |||||
| | | * | | Tests for NaN values in the property x, y, widht and height setters of | Marco Bubke | 2010-02-01 | 1 | -0/+6 |
| | | * | | Merge commit 'qt/4.6' into kinetic-declarativeui | Bjørn Erik Nilsen | 2010-01-27 | 8 | -136/+262 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-20 | 1 | -0/+1 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-19 | 3 | -18/+52 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | * | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-01-14 | 51 | -76/+101 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-05 | 1 | -3/+16 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-17 | 13 | -45/+208 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-10 | 8 | -234/+449 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Fix crash. | Michael Brasser | 2009-12-08 | 1 | -0/+1 |
| | | * | | | | | | | | Fix crash. | Michael Brasser | 2009-12-08 | 1 | -1/+1 |
| | | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-07 | 3 | -25/+7 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-30 | 5 | -226/+32 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-27 | 7 | -26/+41 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-19 | 7 | -371/+197 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'qt/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-11-11 | 5 | -8/+8 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | Revert 4bf7f90a27377f439e86d6175e5e3cdebd131be0 and implement differently. | Warwick Allison | 2009-11-10 | 1 | -3/+0 |
| | | * | | | | | | | | | | | | | Remove no-op diff to 4.6. | Warwick Allison | 2009-11-09 | 1 | -1/+0 |
| | | * | | | | | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-09 | 16 | -480/+1115 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | Remove "to" limit on minor version. | Warwick Allison | 2009-11-05 | 1 | -0/+3 |
| | | * | | | | | | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-04 | 9 | -25/+54 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | Rename QFx classes to QmlGraphics | Aaron Kennedy | 2009-10-30 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-widget-team into kinet... | Aaron Kennedy | 2009-10-29 | 12 | -217/+504 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2009-10-29 | 4 | -9/+29 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-26 | 1 | -3/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-25 | 16 | -546/+1026 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-19 | 11 | -233/+525 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-06 | 3 | -8/+42 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-04 | 3 | -14/+8 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-10-02 | 11 | -168/+506 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Michael Brasser | 2009-09-29 | 1 | -0/+10 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Don't call virtual setPosHelper during destruction | Aaron Kennedy | 2009-09-29 | 1 | -0/+10 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: Fixed several typos. | Martin Smith | 2010-02-12 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-12 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | / / / / / / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsItem: Do not crash at exit if there is static QGraphicsItem. | Olivier Goffart | 2010-02-08 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-09 | 5 | -13/+39 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | / / / / / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup after "QGraphicsWidget is painted twice on the first show" | Bjørn Erik Nilsen | 2010-02-04 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsWidget is painted twice on the first show. | Bjørn Erik Nilsen | 2010-02-03 | 1 | -1/+6 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsScene: Use QPainter::setClipRect instead of setClipPath if possible. | Bjørn Erik Nilsen | 2010-02-03 | 1 | -3/+15 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fixes missing update when setting opacity on an item that had opacity 0.0 | Leonardo Sobral Cunha | 2010-01-29 | 1 | -0/+3 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Avoids missing opacity updates by not propagating the ignoreOpacity flag | Leonardo Sobral Cunha | 2010-01-29 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Adds convenience functions QGraphicsItemPrivate::isOpacityNull | Leonardo Sobral Cunha | 2010-01-29 | 3 | -7/+14 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-01 | 8 | -146/+284 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / |