Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | | | | | * | | | | | | | | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-19 | 110 | -784/+936 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-12 | 2 | -3/+10 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'qt/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-11-11 | 76 | -436/+746 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * | | | | | | | | | | | | | | | | | | | 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 | 147 | -1935/+3889 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | Compile... | Gunnar Sletta | 2009-11-06 | 1 | -2/+2 | |
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | 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 | 125 | -2747/+3277 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | introduce int QTextDocument::available{Undo,Redo}Steps() const; | hjk | 2009-11-03 | 3 | -0/+33 | |
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Aaron Kennedy | 2009-10-30 | 1 | -1/+0 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Warwick Allison | 2009-10-30 | 74 | -540/+1058 | |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | fix merge duplication | Warwick Allison | 2009-10-29 | 1 | -1/+0 | |
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | Rename QFx classes to QmlGraphics | Aaron Kennedy | 2009-10-30 | 1 | -1/+1 | |
| | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of ../qt-widget-team into kinetic-declarativeui | Aaron Kennedy | 2009-10-29 | 1 | -2/+2 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-widget-team into kinet... | Aaron Kennedy | 2009-10-29 | 50 | -415/+899 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2009-10-29 | 26 | -125/+159 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-26 | 4 | -7/+113 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-25 | 125 | -1246/+2690 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-19 | 29 | -183/+330 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-19 | 119 | -2207/+4500 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-06 | 41 | -319/+866 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-04 | 27 | -293/+555 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-10-02 | 76 | -673/+1500 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | 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 branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-09-29 | 163 | -1989/+3533 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'origin/4.6' into kinetic-declarativeui | Lars Knoll | 2009-09-18 | 55 | -565/+1832 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix to QSyntaxHighlighter not rehighlighting enough | mae | 2009-09-17 | 1 | -1/+1 | |
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Alan Alpert | 2009-09-15 | 2 | -2/+18 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-09-15 | 55 | -186/+1087 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-09-15 | 10 | -52/+36 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-09-15 | 1098 | -5002/+5460 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-09-08 | 10 | -61/+143 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix crash on QGraphicsItem destruction related to focus handling (redone) | Kai Koehne | 2009-09-08 | 1 | -1/+3 | |
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Martin Jones | 2009-09-08 | 41 | -599/+891 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-09-04 | 23 | -24/+850 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Aaron Kennedy | 2009-09-04 | 67 | -377/+2880 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'qt/4.6' into kinetic-declarativeui | Bjørn Erik Nilsen | 2009-09-03 | 67 | -377/+2880 | |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't call pure virtuals on deleting QGraphicsItem | Aaron Kennedy | 2009-09-04 | 1 | -1/+3 | |
| | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-09-01 | 5 | -21/+66 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'qt/4.6' into kinetic-declarativeui | Bjørn Erik Nilsen | 2009-09-01 | 16 | -169/+348 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-08-31 | 1088 | -14393/+14572 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-08-31 | 101 | -767/+1552 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixup 928e81b68e0b695662c7ee3dd0bfa409a7ca1ffd | Aaron Kennedy | 2009-08-27 | 1 | -15/+3 | |
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Focus Scope support in GraphicsView | Aaron Kennedy | 2009-08-27 | 5 | -88/+166 | |
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bad merge of QVector3D. | Michael Brasser | 2009-08-25 | 2 | -10/+0 | |
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-08-25 | 316 | -1938/+25142 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix compilation (missing include) | Kai Koehne | 2009-08-25 | 1 | -0/+1 | |
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QVector3D: missing implicit conversion to QVariant | Thomas Hartmann | 2009-08-25 | 2 | -0/+10 | |