diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-10 15:54:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-10 15:54:44 (GMT) |
| commit | d7316a6d6a088bf01695a0832182b677ad55907b (patch) | |
| tree | 0c2667aec4087b8805ee2d67577b70a29a0fb18a /.gitignore | |
| parent | 9b83735e073e9f7acb5369d375be7d8a48faf5db (diff) | |
| parent | 8f84ccc8d16383e722f07578dbfa2b15c2b24431 (diff) | |
| download | Qt-d7316a6d6a088bf01695a0832182b677ad55907b.zip Qt-d7316a6d6a088bf01695a0832182b677ad55907b.tar.gz Qt-d7316a6d6a088bf01695a0832182b677ad55907b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (59 commits)
Doc: Cleaning style and adding support for Creator
Add NTLMv2 authentication support to QAuthenticator.
QIODPLB: Sync behavior of ungetBlock() and ungetChar()
QFileIconProvider: Load icons on demand.
Doc: fixing offline style
Fix handling of SSL certificates with wildcard domain names
Doc: fixing examples link
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
SSL library loading: load system libs only once
Revert "SSL backend: load libraries for certificates only once"
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
Doc: Adding support for Qt Creator style
doc: Fixed last of the declarative/QML qdoc warnings.
qdoc: Marked some missing declarative properties and functions as \internal.
qhelpgenerator: Fix namespace syntax checking.
...
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions