diff options
| author | Jani Hautakangas <jani.hautakangas@nokia.com> | 2011-07-04 21:11:09 (GMT) |
|---|---|---|
| committer | Jani Hautakangas <jani.hautakangas@nokia.com> | 2011-07-04 21:11:09 (GMT) |
| commit | c018f01b8a97e9ae3dee12777fd1bde4c51f231e (patch) | |
| tree | 622fe32e3fde6cfa1e356a1349511749fb0870fc /doc/src/external-resources.qdoc | |
| parent | 73d7fdf686c05adaf0ea8ecddfb264b7741a2e6a (diff) | |
| parent | 0a5d51aaf95524d6c5933404f0e5ab9b331d4084 (diff) | |
| download | Qt-c018f01b8a97e9ae3dee12777fd1bde4c51f231e.zip Qt-c018f01b8a97e9ae3dee12777fd1bde4c51f231e.tar.gz Qt-c018f01b8a97e9ae3dee12777fd1bde4c51f231e.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
doc/src/external-resources.qdoc
src/gui/text/qtextlayout.cpp
src/opengl/qwindowsurface_gl.cpp
Diffstat (limited to 'doc/src/external-resources.qdoc')
| -rw-r--r-- | doc/src/external-resources.qdoc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index 5431ec8..2794d48 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -493,3 +493,8 @@ \externalpage http://msdn.microsoft.com/en-us/library/dd318066.aspx \title Microsoft Active Accessibility Event Constants */ + +/*! + \externalpage http://www.developer.nokia.com/Community/Wiki/Graphics_memory_handling + \title Graphics Out Of Memory monitor +*/ |