summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontengine_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-19 05:23:19 +0200
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-19 05:23:19 +0200
commitdf6549d1b95af017305744af04a7bb3b10025660 (patch)
tree0919c82a21e0b0056f0eb180ce139c8ab99eb633 /src/gui/text/qfontengine_p.h
parent84f984b24400aed7cc72fdf432a076f98bc142a2 (diff)
parent63d0b54df365380107cea7017c7893c7d04df13e (diff)
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: (351 commits) Fix compilation after merge fix for looping crash log on data abort Allow commenting of individual files in generated pkg files. Removed README.s60-mkspec. Fixed install docs for Qt for Symbian on Linux. Performance docs. Added symbian defs for e55781212532e2abcdd1cef8548b146fb14f0713 Check for binding having been deleted in more places Position GridView and ListView footer correctly when model cleared. Clean up particle motion documentation Finish QML for Qt Programmers section Distinguish Qt Quick, Qt Declarative and QML on the landing page Split responsibilities in QDeclarativeExpression more cleanly improvements to docs and examples Fix test for get() to check for undefined return values Enter key performs same action as Return key in QML demos. Revert "Making network reconnect happen after teardown." Revert "Adding some error checking for setdefaultif" Fixed a possible hanging bug in the Symbian networking. Fixed a network hanging bug on Symbian. ...
Diffstat (limited to 'src/gui/text/qfontengine_p.h')
0 files changed, 0 insertions, 0 deletions