summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-10101-1851/+1865
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-093-38/+321
| |\
| | * Add NTLMv2 authentication support to QAuthenticator.Thiago Macieira2010-07-091-7/+279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also fixes a long-standing bug in handling usernames of type "domainname\username", typical of Windows domains, that didn't work with the previous NTLMv1 code. Patch by subcontractor. Task-number: QTBUG-9408, QTBUG-2421, QT-3248 Reviewed-By: Markus Goetz
| | * QIODPLB: Sync behavior of ungetBlock() and ungetChar()Andreas Kling2010-07-091-1/+1
| | | | | | | | | | | | | | | ungetChar() supports ungetting data that didn't originate from the QIODevicePrivateLinearBuffer, so ungetBlock() should too.
| | * QFileIconProvider: Load icons on demand.Friedemann Kleint2010-07-091-30/+41
| | | | | | | | | | | | | | | | | | | | | | | | Drawing icons is quite costly and mostly, only 'file' and 'directory' are required. Speeds up application startup considerably. Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | Doc: Cleaning style and adding support for CreatorMorten Engvoldsen2010-07-095-479/+749
| |/ | | | | | | Note: Support for creator has been disabled. HTML-generator needs an update.
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-092-20/+43
| |\
| | * Fix QWizard icon and metrics on Windows 7 and VistaJens Bache-Wiig2010-06-182-20/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch takes care of missing icon on Windows Vista+7. It also updates the metrics to look more native in both versions. Task-number: QTBUG-9873, QTBUG-11974, QTBUG-6120 Reviewed-by: prasanth
| * | Doc: fixing offline styleMorten Engvoldsen2010-07-091-7/+5
| |/
| * Fix handling of SSL certificates with wildcard domain namesRichard J. Moore2010-07-093-4/+63
| | | | | | | | | | | | Merge-request: 731 Task-number: QTBUG-4455 Reviewed-by: Peter Hartmann
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-0912-61/+68
| |\
| | * doc: Fixed several qdoc warnings.Martin Smith2010-07-092-3/+3
| | |
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-093-36/+36
| | |\
| | | * SSL library loading: load system libs only oncePeter Hartmann2010-07-091-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and make the loading thread-safe. The global methods for loading the OpenSSL libraries and the system libraries are accessed from within different QSslSocket and QSslConfiguration instances, so they need to be thread-safe. Reviewed-by: Markus Goetz
| | | * Revert "SSL backend: load libraries for certificates only once"Peter Hartmann2010-07-093-30/+29
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f2187e31de13a6ab8631a9067487dab555f7c2e7. Reviewed-by: Markus Goetz
| | * | doc: Fixed several qdoc warnings.Martin Smith2010-07-091-1/+6
| | |/
| | * doc: Fixed several qdoc warnings.Martin Smith2010-07-091-1/+1
| | |
| | * doc: Fixed several qdoc warnings.Martin Smith2010-07-091-2/+2
| | |
| | * doc: Fixed several qdoc warnings.Martin Smith2010-07-092-2/+3
| | |
| | * doc: Fixed several qdoc warnings.Martin Smith2010-07-091-1/+2
| | |
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-093-2/+18
| | |\
| | * | doc: Fixed several qdoc warnings.Martin Smith2010-07-093-15/+15
| | | |
| * | | Doc: fixing examples linkMorten Engvoldsen2010-07-091-1/+1
| | |/ | |/|
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-094-15/+23
| |\ \ | | |/
| | * doc: Fixed last of the declarative/QML qdoc warnings.Martin Smith2010-07-094-15/+23
| | |
| * | Doc: Adding support for Qt Creator styleMorten Engvoldsen2010-07-093-2/+18
| |/ | | | | | | | | | | Adding a variable to the qdocconf file will now generate the docs in Creator format Reviewed-by: Martin Smith
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-091-2/+4
| |\
| | * qhelpgenerator: Fix namespace syntax checking.ck2010-07-091-2/+4
| | |
| * | qdoc: Marked some missing declarative properties and functions as \internal.Martin Smith2010-07-093-34/+33
| |/
| * Corrected pathsMark Brand2010-07-081-2/+2
| | | | | | | | | | Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-082-2/+2
| |\
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-0836-59/+424
| | |\
| | * | qdoc: Fixed broken QML property links.Martin Smith2010-07-082-2/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-12038
| * | | Doc: Correcting img bugMorten Engvoldsen2010-07-081-1/+0
| | |/ | |/| | | | | | | Task-number: QTBUG-12028
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-087-14/+296
| |\ \
| | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-085-6/+38
| | |\ \
| | | * | Change default TapAndHold timeout and make configurableThomas Zander2010-07-084-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new default timeout is 700ms and is what Nokia Research found through usability studies. Nevertheless lets provide public API to set this through a platform plugin or similar. Reviewed-By: Denis
| | | * | Avoid unneeded additionThomas Zander2010-07-081-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Denis
| | * | | Doc: changing offline styleMorten Engvoldsen2010-07-081-0/+251
| | |/ / | | | | | | | | | | | | This file will however be replaced in the near future
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-0832-935/+250
| | |\ \
| | * | | Doc: fixing style from 600 to bold weightMorten Engvoldsen2010-07-081-8/+7
| | | | |
| * | | | Doc: change on index pageMorten Engvoldsen2010-07-081-1/+1
| | |/ / | |/| |
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-0828-43/+199
| |\ \ \
| | * | | Build Qt with option -Zc:wchar_t under MSVCliang jian2010-07-083-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make projects generated by visual studio being successfully linked to the Qt dlls if they use the QString::fromWCharArray() or QString::toWCharArray() methods. Merge-request: 727 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | Fix compilation when QT_NO_IM is definedTasuku Suzuki2010-07-083-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 734 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-0863-1473/+534
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) fix build with sqlite2 respect UI_DIR when creating image collections Doc: more cleaning Doc: fixing escape character Doc: cleaning html generator Doc: changing index page Doc: fixing link to devnet Doc: adding HTML class names and style docs to the generator Doc: Fixing typo - background file name doc: Added doc for accessing views and models from delegates. Doc: Fixing broken link Doc: fixing typo Doc: fixing typos qdoc: Fixed table of contents for namespace pages. SSL backend: load libraries for certificates only once immediately set function context when entering a namespace Phonon MediaSource fails to load when passed as a resource file Set QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH to default value qdoc: Fixed a few links to QtObject (QML:QtObject) Simplify *= to += after contains() test ...
| | | * | | fix build with sqlite2Oswald Buddenhagen2010-07-081-2/+2
| | | | | |
| | | * | | respect UI_DIR when creating image collectionsOswald Buddenhagen2010-07-081-6/+6
| | | | |/ | | | |/| | | | | | | | | | | | | | | | Reviewed-by: joerg Task-number: QTBUG-11752
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-087-894/+54
| | | |\ \
| | | * | | doc: Added doc for accessing views and models from delegates.Martin Smith2010-07-081-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11648
generated by cgit v0.12 at 2025-01-22 13:28:59 (GMT)