summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/benchmarks.pro
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-251-2/+2
|\ | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/cppcodemarker.cpp
| * Merge branch '4.5' into 4.6Thiago Macieira2009-10-211-2/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/widgets/qmenu_mac.mm tests/benchmarks/benchmarks.pro tests/benchmarks/qnetworkreply/tst_qnetworkreply.cpp
| | * Backport benchmarks/qnetworkreply to 4.5Markus Goetz2009-10-201-0/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Long live Qt 4.5!Lars Knoll2009-03-231-0/+19
| |
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Martin Jones2009-09-081-0/+1
|\ \ | |/ | | | | kinetic-declarativeui
| * New Benchmark: file:// with QFile vs QNetworkAccessManagerMarkus Goetz2009-09-071-0/+1
| | | | | | | | Reviewed-by: Leo
* | Merge branch 'master' of ../qt into kinetic-declarativeuiAaron Kennedy2009-07-291-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 testingMarkus Goetz2009-07-231-0/+1
| | | | | | | | Reviewed-by: Thiago
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-07-231-1/+2
|\ \ | |/ | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe src/gui/kernel/qaction.h
| * Added missing autotest/benchmark projects to the root .pro-fileDenis Dzyubenko2009-07-161-1/+2
| |
* | Merge commit 'mainline/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-041-0/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: configure.exe src/gui/math3d/qmatrix4x4.cpp src/gui/math3d/qmatrix4x4.h tools/qdoc3/htmlgenerator.cpp
| * Add some performance tests for QMatrix4x4Rhys Weatherley2009-06-021-0/+1
| |
| * Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-171-0/+20
|
* Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-221-1/+10
|
* Long live Qt!Lars Knoll2009-03-231-0/+19