diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-07 23:25:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-07 23:25:02 (GMT) |
| commit | 44277b86571d78f30f0d0393d01b11c672672ea2 (patch) | |
| tree | 0032201e925a608b68fb0808de71ea012b69e049 /doc/src/snippets/plaintextlayout/window.cpp | |
| parent | a985ed3b8f891f10abf99e5ef7756ca16a020d57 (diff) | |
| parent | 81f1948d84d037e5fe5d124e3d36c14d281ac6fe (diff) | |
| download | Qt-44277b86571d78f30f0d0393d01b11c672672ea2.zip Qt-44277b86571d78f30f0d0393d01b11c672672ea2.tar.gz Qt-44277b86571d78f30f0d0393d01b11c672672ea2.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Don't try and use QFactoryLoader when relevant features are turned off.
Diffstat (limited to 'doc/src/snippets/plaintextlayout/window.cpp')
0 files changed, 0 insertions, 0 deletions