summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/benchmarks.pro
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-161-44/+6
|\ | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| * Restructure tests/benchmarks directory.Bjørn Erik Nilsen2010-02-081-46/+6
| | | | | | | | | | | | We follow the same structure as used in the src directory. This makes it easier to navigate through the jungel, especially now that we are going to add functional tests etc.
* | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-02-021-0/+1
|\ \ | |/ | | | | | | | | | | kinetic-declarativeui Conflicts: tools/linguist/lupdate/main.cpp
| * Add QFontMetrics benchmark.Michael Brasser2010-01-291-0/+1
| |
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2010-01-141-0/+2
|\ \ | | | | | | | | | into kinetic-declarativeui
| * \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-01-141-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: bin/syncqt src/corelib/io/qurl.cpp
| | * Add new benchmark for some qtext features.Thomas Zander2010-01-081-0/+1
| | | | | | | | | | | | | | | I test loading some html into a qtextdocument and doing of shaping on an unformatted text of different scripts and bidiness.
| | * tst_qtcpserver: Move benchmarksMarkus Goetz2010-01-041-0/+1
| | | | | | | | | | | | | | | | | | Move benchmarks into tests/benchmarks directory. Reviewed-by: Thiago
* | | Benchmark cleanup.Michael Brasser2010-01-141-0/+1
|/ /
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiAaron Kennedy2010-01-051-1/+3
|\ \ | |/
| * Merge branch '4.5' into 4.6-stagingThiago Macieira2009-12-261-0/+1
| |\ | | | | | | | | | | | | Conflicts: tests/benchmarks/benchmarks.pro
| | * Add QHostInfo benchmarkMarkus Goetz2009-12-181-0/+1
| | | | | | | | | | | | Reviewed-by: Peter Hartmann
| * | Optimize QThreadStorage with QVectorOlivier Goffart2009-12-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QThreadStorageData::get might be accessed very often. QMap lookup has proven to be too slow. We can expect about 20 instances of QThreadStorage in a typical applications (tested with some KDE applications) So a QVector is more suited Note: we now re-use the ids. Which means that if the QThreadStorage is destroyed before the QThread, and another one is created, we might get crashes (instead of a warning printed to the console) Reviewed-by: brad
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-171-8/+16
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: .gitignore tests/benchmarks/benchmarks.pro
| * | Add missing benchmark to the benchmarks.proOlivier Goffart2009-12-111-1/+19
| | | | | | | | | | | | | | | | | | This does not add the benchmark that runs too slowly. Reviewed-by: jasplin
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-071-0/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/tools/moc/generator.cpp
| * | Introduce QFileInfo benchmarkMarkus Goetz2009-11-251-0/+1
| | | | | | | | | | | | | | | | | | Right now only a benchmark for the canonicalized path. Reviewed-by: TrustMe
* | | 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