Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-10-25 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/cppcodemarker.cpp | ||||
| * | Merge branch '4.5' into 4.6 | Thiago Macieira | 2009-10-21 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/widgets/qmenu_mac.mm tests/benchmarks/benchmarks.pro tests/benchmarks/qnetworkreply/tst_qnetworkreply.cpp | ||||
| | * | Backport benchmarks/qnetworkreply to 4.5 | Markus Goetz | 2009-10-20 | 1 | -0/+1 |
| | | | | | | | | | | | | Reviewed-by: TrustMe | ||||
| | * | Long live Qt 4.5! | Lars Knoll | 2009-03-23 | 1 | -0/+19 |
| | | |||||
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Martin Jones | 2009-09-08 | 1 | -0/+1 |
|\ \ | |/ | | | | | kinetic-declarativeui | ||||
| * | New Benchmark: file:// with QFile vs QNetworkAccessManager | Markus Goetz | 2009-09-07 | 1 | -0/+1 |
| | | | | | | | | Reviewed-by: Leo | ||||
* | | Merge branch 'master' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2009-07-29 | 1 | -0/+1 |
|\ \ | |/ | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/widgets/qlineedit.cpp | ||||
| * | tst_qnetworkreply: Small and simple latency testing | Markus Goetz | 2009-07-23 | 1 | -0/+1 |
| | | | | | | | | Reviewed-by: Thiago | ||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Aaron Kennedy | 2009-07-23 | 1 | -1/+2 |
|\ \ | |/ | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe src/gui/kernel/qaction.h | ||||
| * | Added missing autotest/benchmark projects to the root .pro-file | Denis Dzyubenko | 2009-07-16 | 1 | -1/+2 |
| | | |||||
* | | Merge commit 'mainline/master' into kinetic-declarativeui | Bjørn Erik Nilsen | 2009-06-04 | 1 | -0/+1 |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: configure.exe src/gui/math3d/qmatrix4x4.cpp src/gui/math3d/qmatrix4x4.h tools/qdoc3/htmlgenerator.cpp | ||||
| * | Add some performance tests for QMatrix4x4 | Rhys Weatherley | 2009-06-02 | 1 | -0/+1 |
| | | |||||
| * | Initial import of statemachine branch from the old kinetic repository | Alexis Menard | 2009-04-17 | 1 | -0/+20 |
| | |||||
* | Initial import of kinetic-dui branch from the old kinetic | Michael Brasser | 2009-04-22 | 1 | -1/+10 |
| | |||||
* | Long live Qt! | Lars Knoll | 2009-03-23 | 1 | -0/+19 |