summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-09-121-9/+9
|\
| * Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-09-0912-32/+124
| |\
| | * Merge remote-tracking branch 'mainline/4.7' into 4.7Casper van Donderen2011-09-091-0/+5
| | |\
| | * \ Merge remote-tracking branch 'mainline/4.7' into 4.7Casper van Donderen2011-09-0810-23/+110
| | |\ \
| | * | | Migrate addMarkUp function to QChar.Casper van Donderen2011-09-081-9/+9
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-122-5/+8
|\ \ \ \ \
| * | | | | StrictlyEnforceRange with snapOneItem/Row and header behavior changeMartin Jones2011-09-122-5/+8
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-09-093-5/+12
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Release font engine refcount when done using it in QTextEngineJiang Jiang2011-09-093-5/+12
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-09-081-0/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | update the proxy info before session is opened in QNAM by Aapo MakelaKranthi Kuntala2011-09-081-0/+5
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-09-072-6/+7
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-09-0541-145/+727
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Fix assert error on Windows with a negative char.Casper van Donderen2011-09-021-4/+4
| | * | | | Merge remote-tracking branch 'mainline/4.7' into 4.7Casper van Donderen2011-09-0240-141/+723
| | |\ \ \ \
| * | \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-08-21413-55011/+43266
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-08-17411-55008/+43262
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-07-211-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Added an additional check to workaround an issue on Windows.David Boddie2011-07-071-1/+1
| | * | | | | | | Doc: Fixed the example of an encoded URL in the class description.David Boddie2011-07-211-2/+3
| | |/ / / / / /
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-09-075-21/+48
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | QSslCertificate: block all DigiNotar (intermediate and root) certsPeter Hartmann2011-09-062-8/+35
| * | | | | | | QSslCertificate: also check common name for blacklisted certificatesPeter Hartmann2011-09-061-11/+12
| * | | | | | | Fix typo in header guard.Jason McDonald2011-09-061-1/+1
| * | | | | | | fix doc typoOswald Buddenhagen2011-09-051-1/+1
| * | | | | | | Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdkOswald Buddenhagen2011-09-051-1/+1
| * | | | | | | remove obsolete defineOswald Buddenhagen2011-09-051-1/+0
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-075-2/+62
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Dragging in nested views no longer works as expectedMartin Jones2011-09-071-1/+1
| * | | | | Fix implicit height not growing when pre-edit text wraps.Andrew den Exter2011-09-062-1/+47
| * | | | | Fix leak in State element.Michael Brasser2011-09-021-0/+12
| * | | | | Fix leak in bindings created by PropertyChanges.Michael Brasser2011-09-011-0/+2
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-09-021-4/+4
|\ \ \ \ \ \
| * | | | | | URLs used with scheme handler use appropriate encoding for schememread2011-09-011-4/+4
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-022-4/+8
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Revert readonly BorderImage::sourceSize changeMartin Jones2011-09-012-4/+8
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-010-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix memory leak in ListModel custom parserBea Lam2011-09-011-0/+1
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-317-13/+18
|\ \ \ \ \ \ \ | | |/ / / / / | |/| / / / / | |_|/ / / / |/| | | | |
| * | | | | DEF file updateGareth Stockwell2011-08-312-2/+2
| * | | | | Merge branch 'qt-4.7' into 4.7Liang Qi2011-08-3145-284/+593
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-302-0/+31
|\ \ \ \ \ \
| * | | | | | QSslCertificate: blacklist fraudulent *.google.comPeter Hartmann2011-08-302-0/+31
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-3043-285/+563
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilterSami Merila2011-08-301-4/+0
| * | | | | | Added an additional check to workaround an issue on Windows.David Boddie2011-08-301-1/+1
| * | | | | | Exact word bubble doesn't disappear when screen is tapped (fix part 2)Sami Merila2011-08-302-4/+11
| * | | | | | Exact word bubble doesn't disappear when screen is tappedSami Merila2011-08-301-0/+4
| * | | | | | Compile fix for Symbian 5th and earlierSami Merila2011-08-301-2/+5
| * | | | | | Symbian: Fix backspace on empty lines of multiline texteditsMiikka Heikkinen2011-08-301-1/+18
generated by cgit v0.12 at 2024-11-11 20:41:37 (GMT)