summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-282-1/+13
|\
| * Fix text selection with shift-click.Andrew den Exter2011-03-282-1/+13
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-282-8/+12
|\ \
| * | Fixed infinite loop in QPainterPath::intersects() when qreal=float.Samuel Rødal2011-03-282-8/+12
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-2817-9/+296
|\ \ \
| * | | QSslSocket: add test for blacklisted certificatesPeter Hartmann2011-03-253-3/+74
| * | | QSslSocket internals: abort on encountering blacklisted certificatesPeter Hartmann2011-03-251-0/+7
| * | | QSslCertificate: fix test for blacklisted certs on WindowsPeter Hartmann2011-03-251-2/+2
| * | | QSslCertificate: report fraudulent certificates as invalidPeter Hartmann2011-03-2412-4/+213
| * | | FTP: Only read as much as the buffer size the user providedMarkus Goetz2011-03-241-2/+2
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-03-27505-15938/+25837
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-03-277-14/+18
| |\ \ \
| | * \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-22323-2125/+14874
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-22317-2117/+14864
| | | |\ \ \
| | | * | | | qdoc: Avoid infinite loops in table of contents generation.David Boddie2011-03-211-1/+4
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-189-195/+204
| | | |\ \ \ \
| | | * | | | | Removed the documentation from the install rule.David Boddie2011-03-181-1/+1
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-157-209/+268
| | | |\ \ \ \ \
| | | * | | | | | Doc: Fixed typo.David Boddie2011-03-151-1/+1
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-146-16/+83
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-0815-23/+239
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Doc: Fixed QML snippet highlighting by creating a complete code snippet.David Boddie2011-03-032-4/+3
| | | * | | | | | | | Fixed invalid HTML output.David Boddie2011-03-031-1/+1
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-22270-1753/+11986
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-03-2116-352/+487
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-183-1/+30
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | | * | | | | | | | qdoc: Added the <othermeta> element.Martin Smith2011-03-183-1/+30
| | * | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-176-192/+173
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-175-12/+19
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Doc: Fixed reference to absolete API in exceptionsafety.htmlGeir Vattekar2011-03-172-2/+7
| | | | * | | | | | | | Doc: Removed links to obsolete API in QResourceGeir Vattekar2011-03-171-3/+3
| | | | * | | | | | | | Doc: Fixed broken links in QIcon::fromTheme()Geir Vattekar2011-03-171-5/+8
| | | * | | | | | | | | qdoc: Completed changing <section> structure.Martin Smith2011-03-172-182/+155
| | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-171-2/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-178-210/+269
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | * | | | | | | | Doc: Fixed doc bug in undo framework exampleGeir Vattekar2011-03-171-2/+1
| | * | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-153-205/+264
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-155-5/+5
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | qdoc: Changed <section> structure.Martin Smith2011-03-153-205/+264
| | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-144-4/+4
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Doc: Typo fixesThorbjørn Lindeijer2011-03-144-4/+4
| | | | |_|_|_|/ / / | | | |/| | | | | |
| | * | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-141-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Doc: Fixed snippet documenting QMetaObject::classInfoThorbjørn Lindeijer2011-03-141-1/+1
| | | |/ / / / / /
| | * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-111-1/+4
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-104-14/+78
| | | |\ \ \ \ \ \
| | | * | | | | | | Doc: Cannot alter SelectionMode of a combobox's viewGeir Vattekar2011-03-101-1/+4
| | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-104-14/+78
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | qdoc: Added <publisher> and <permissions> elements.Martin Smith2011-03-103-9/+45
| | | * | | | | | qdoc: Added <component> element to contain the module name.Martin Smith2011-03-101-1/+6
| | | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-096-11/+18
| | | |\ \ \ \ \ \ | | | | |/ / / / /