diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-29 13:56:11 +0100 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-29 13:56:11 +0100 |
| commit | e2f9547983c15be88c0a096dd52cc7c7a0eac0c6 (patch) | |
| tree | 8fc8d27b673a0bb1b0fe5d2c480803d78ab61ccc /src/gui/image/qpixmap_x11.cpp | |
| parent | 26af4d54ea4f3a48d053038f34a00aa1119a585b (diff) | |
| parent | d98d31ca34a84a03dbac20fbf1dc88c0f8fd93cb (diff) | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc fix. No need to put something deprecated if it's not.
Warn if the plugin seems to not exist instead of simply passing.
Diffstat (limited to 'src/gui/image/qpixmap_x11.cpp')
0 files changed, 0 insertions, 0 deletions