diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-05 23:19:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-05 23:19:24 (GMT) |
| commit | 80bef4fca1bbafd6eaea20059424709ca38031c7 (patch) | |
| tree | 5e642643af42190a4ca0bc200d9c7017fee6b51d /doc/src/snippets/code | |
| parent | 901ea45ca02dc8fbbf3f6112240c4e468c240b73 (diff) | |
| parent | 06afa508f2de34cbce9a2798d9418d62e480c283 (diff) | |
| download | Qt-80bef4fca1bbafd6eaea20059424709ca38031c7.zip Qt-80bef4fca1bbafd6eaea20059424709ca38031c7.tar.gz Qt-80bef4fca1bbafd6eaea20059424709ca38031c7.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Issue a warning and disable webkit build when xrender is disabled on X11
QNAM: Move out function calls to new variable
QNAM: Remove QNetworkAccessDataBackend
QNAM: Fix usage of toString of QUrl
QNAM: New specialized QNetworkReply for data: URLs
Diffstat (limited to 'doc/src/snippets/code')
0 files changed, 0 insertions, 0 deletions