summaryrefslogtreecommitdiffstats
path: root/src/svg/qsvgtinydocument_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-30 21:12:35 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-30 21:12:35 (GMT)
commitf70b38f9e7befd675998d39005a82072ddd2862a (patch)
treea94ff00220433606b863ec9f78012433801d4093 /src/svg/qsvgtinydocument_p.h
parent03c2f6a4bdd195cf1b97034237292ba3767938d5 (diff)
parent328d5f7784c41ca9d91459c32f464fcf95eff5ed (diff)
downloadQt-f70b38f9e7befd675998d39005a82072ddd2862a.zip
Qt-f70b38f9e7befd675998d39005a82072ddd2862a.tar.gz
Qt-f70b38f9e7befd675998d39005a82072ddd2862a.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (474 commits) Different version from the previous patch: use QElapsedTimer Compilation after merge. Correct last right bearing in boundingBox(glyphs) Make sure propagated font in QGraphicsWidget can be set on a QPainter Apparently QPen::brush() can't return a NoBrush for a NoPen. Updated some URLs and required tools versions for Symbian Cleanup Remove pointless \internal docs (that contain no information) Remove pointless \internal docs (that contain no information) Internal QML API cleanup Update example screenshot in doc. Add a test for the QPen::brush() != Qt::NoBrush for a Qt::NoPen pen. Calling QPen::brush() on a Qt::NoPen pen, should return QBrush::NoBrush. use QFile:map instead of ::mmap Added support for DEPLOYMENT.pkg_build_version Do not use global static const references to objects Autotest: don't use Q_FUNC_INFO for testing which method got called fix for memory leak in QSysInfo::s60Version() fix generated makefile dependencies Cocoa: Demo browser can get stuck after closing modal dialog ...
Diffstat (limited to 'src/svg/qsvgtinydocument_p.h')
0 files changed, 0 insertions, 0 deletions