summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* QSslSocket: Improve error handlingPeter Hartmann2010-07-131-1/+13
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1349-374/+676
|\
| * Fixing merge conflicts.Martin Smith2010-07-1379-5180/+5874
| |\
| * | QSslSocket: fix documentation for QSslSocket::setPeerVerifyMode()Peter Hartmann2010-07-131-2/+2
| * | QNAM: Add future enum attribute for Zerocopy QNAMMarkus Goetz2010-07-122-0/+10
| * | fix build for -no-qt3supportPeter Hartmann2010-07-121-2/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1046-370/+666
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1046-370/+666
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1046-370/+666
| | | |\ \
| | | | * | Add NTLMv2 authentication support to QAuthenticator.Thiago Macieira2010-07-091-7/+279
| | | | * | QIODPLB: Sync behavior of ungetBlock() and ungetChar()Andreas Kling2010-07-091-1/+1
| | | | * | QFileIconProvider: Load icons on demand.Friedemann Kleint2010-07-091-30/+41
| | | | * | Fix QWizard icon and metrics on Windows 7 and VistaJens Bache-Wiig2010-06-182-20/+43
| | | | * | Fix handling of SSL certificates with wildcard domain namesRichard J. Moore2010-07-092-4/+39
| | | | * | 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
| | | | | * | Revert "SSL backend: load libraries for certificates only once"Peter Hartmann2010-07-093-30/+29
| | | | * | | doc: Fixed several qdoc warnings.Martin Smith2010-07-091-1/+6
| | | | |/ /
| | | | * | doc: Fixed several qdoc warnings.Martin Smith2010-07-091-1/+2
| | | | * | doc: Fixed several qdoc warnings.Martin Smith2010-07-091-6/+6
| | | | * | doc: Fixed last of the declarative/QML qdoc warnings.Martin Smith2010-07-093-7/+7
| | | | * | qdoc: Marked some missing declarative properties and functions as \internal.Martin Smith2010-07-092-33/+31
| | | | * | Corrected pathsMark Brand2010-07-081-2/+2
| | | | * | Change default TapAndHold timeout and make configurableThomas Zander2010-07-084-4/+36
| | | | * | Avoid unneeded additionThomas Zander2010-07-081-2/+2
| | | | * | Fix compilation when QT_NO_IM is definedTasuku Suzuki2010-07-083-1/+8
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0826-263/+175
| | | | |\ \
| | | | | * | fix build with sqlite2Oswald Buddenhagen2010-07-081-2/+2
| | | | | * | SSL backend: load libraries for certificates only oncePeter Hartmann2010-07-073-29/+30
| | | | | * | Phonon MediaSource fails to load when passed as a resource fileJens Bache-Wiig2010-07-071-1/+1
| | | | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-0720-230/+135
| | | | | |\ \
| | | | | | * | Simplify *= to += after contains() testMark Brand2010-07-078-14/+14
| | | | | | * | Consolidate sql driver configuration redundancyMark Brand2010-07-0720-221/+126
| | | | | | * | Fixed whitespace formattingMark Brand2010-07-079-9/+9
| | | | | * | | qdoc: Fixed a few links to QtObject (QML:QtObject)Martin Smith2010-07-071-3/+3
| | | | | |/ /
| | | | | * | Add missing API shimsKent Hansen2010-07-071-0/+6
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-131-0/+4
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix TextInput selectionColor or selectedTextColor -based animationsJoona Petrell2010-07-131-0/+4
* | | | | | | Ensure the section header isn't shown twice.Martin Jones2010-07-131-1/+6
|/ / / / / /
* | | | | | Private variable cleanup.Michael Brasser2010-07-133-21/+19
* | | | | | wantsFocus should be based on FocusScope chain, not parent chain.Michael Brasser2010-07-132-2/+9
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-121-5/+7
|\ \ \ \ \ \
| * | | | | | Doc: Removed links to Qt3 support in QHostAddressGeir Vattekar2010-07-121-5/+7
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-121-0/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Added some asserts to avoid race conditions in networking.axis2010-07-121-0/+6
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-122-17/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge remote branch 'oslo-staging-2/4.7' into qtbug-11996Aaron McCarthy2010-07-12110-575/+1983
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Quiet qmake warnings during configure.Aaron McCarthy2010-07-082-17/+21
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-127-281/+513
|\ \ \ \ \ \ \