Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/master' | Jason Barron | 2009-08-06 | 1 | -30/+30 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qfilesystemmodel/qfilesystemmodel.pro tests/auto/qfontdialog/tst_qfontdialog.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp tests/auto/qsqldriver/qsqldriver.pro tests/auto/qsqlquery/qsqlquery.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qstatemachine/tst_qstatemachine.cpp tests/auto/qtcpsocket/tst_qtcpsocket.cpp | ||||
| * | Trailing whitespace and tab/space fixes for auto tests | Janne Anttila | 2009-08-04 | 1 | -31/+31 |
| | | |||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Alexis Menard | 2009-06-17 | 1 | -2/+2 |
|\ \ | |/ | | | | | qt-main/qgraphicssceneindex | ||||
| * | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 1 | -2/+2 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Long live Qt 4.5! | Lars Knoll | 2009-03-23 | 3 | -0/+703 |
| | |||||
* | Fix deletion of indexed items, and fix comments. | Alexis Menard | 2009-05-05 | 1 | -1/+0 |
| | | | | | | | | | It was not a good idea to delete all items in the middle of the loop when clearing the scene since we change the content of indexedItems by deleting one of them. We need to store first all top level items in a temporary list and then delete them in one shot (that will delete their children as well). | ||||
* | Long live Qt! | Lars Knoll | 2009-03-23 | 3 | -0/+703 |