diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-31 19:15:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-31 19:15:30 (GMT) |
| commit | d8e3ed4926bf3529329d774a1c17cd0d45483de0 (patch) | |
| tree | 51ec5f16f0f8c22e242d21eafcb94a6ce2578b39 /tools/configure/configureapp.cpp | |
| parent | 882992494e0c6f6510e95976abdac5d57966eb6c (diff) | |
| parent | bba97ff5e7faecfaf9b3d0cbb0e2d788bdfd5ab9 (diff) | |
| download | Qt-d8e3ed4926bf3529329d774a1c17cd0d45483de0.zip Qt-d8e3ed4926bf3529329d774a1c17cd0d45483de0.tar.gz Qt-d8e3ed4926bf3529329d774a1c17cd0d45483de0.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:
Update to the NTLM code.
QTextEngine::LayoutData::reallocate musn't corrupt memory
Updated Twitter demo in response to the new Twitter oauth requirement
doc: Remove \internal tag from QScriptProgram
Doc: Reviewed updates to the model/view tutorial.
QNetworkAccessManager doc: add since tag for added enum
fixed compilation problem
added missing files
added missing files
problem: 2 images that were in raw html tables appeared smaller in konqueror for some reason - solution: fixed width for right columns in 2 raw html tables
moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8
Diffstat (limited to 'tools/configure/configureapp.cpp')
0 files changed, 0 insertions, 0 deletions