summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmldom.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-19 15:59:17 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-19 15:59:17 (GMT)
commitdc0ce606eb848730c1d5047eaad4ec061ffe2dde (patch)
tree282e58aed1775939a13729eb3bcc7f50e3697eaa /src/declarative/qml/qmldom.cpp
parent7e7cbe2152efe47972e11875f008ddb8f0cc78db (diff)
parentc5a89b5b11ba72d6078e625cc4c4111b76bd3251 (diff)
downloadQt-dc0ce606eb848730c1d5047eaad4ec061ffe2dde.zip
Qt-dc0ce606eb848730c1d5047eaad4ec061ffe2dde.tar.gz
Qt-dc0ce606eb848730c1d5047eaad4ec061ffe2dde.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (128 commits) Fixed QGraphicsScene autotest failure in task250680_childClip. Fix fallback for QStaticText when it's unsupported in paint engine Skip OpenGL threading tests on Mac as they were causing reboots Fixed compile of autotests. Fix warnings on gcc Add experimental VBO support for drawCachedGlyphs()'s index array Fix threaded gl autotest build failure on GLES2 Removed redundant debug output from trace benchmark. Added two QML based traces to trace benchmark. Fixed old trace files no longer working. Reduced the memory footprint of qttrace files. Added trace replayer benchmark. Added --range and --single arguments to qttracereplay. Always accept values reported directly using QTest::setBenchmarkResult. Make threading use-cases work for X11 Run firstRun initialization in declarative/painting benchmark Optimization for text drawing on OpenGL Enable QStaticText in QtDeclarative painting benchmark Fix no-webkit compiler helpviewer Make sure height of glyph cache is a power of two ...
Diffstat (limited to 'src/declarative/qml/qmldom.cpp')
0 files changed, 0 insertions, 0 deletions