diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-12 06:28:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-12 06:28:47 (GMT) |
| commit | 6f736694461edc25b6e757f40ab9cad6a9207ad4 (patch) | |
| tree | bd89c12b8042edfc3d241567d40783412e969de0 /src/gui/text/qtextcontrol.cpp | |
| parent | 27f8facfea87d7c4669852e7aa0fe5d9ca828eb3 (diff) | |
| parent | e6e4dbbf82fca646d95c86b5c4f9132378286198 (diff) | |
| download | Qt-6f736694461edc25b6e757f40ab9cad6a9207ad4.zip Qt-6f736694461edc25b6e757f40ab9cad6a9207ad4.tar.gz Qt-6f736694461edc25b6e757f40ab9cad6a9207ad4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Add meta-data keys for embedded images.
Diffstat (limited to 'src/gui/text/qtextcontrol.cpp')
0 files changed, 0 insertions, 0 deletions