summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-194-8/+32
|\
| * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-184-8/+32
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-182-3/+3
| | |\
| | | * Fix non-ascii name issues in ICD.Xizhi Zhu2011-08-182-3/+3
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-181-2/+5
| | |\ \
| | | * | Compile fix for Symbian 5th and earlierSami Merila2011-08-181-2/+5
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-171-2/+6
| | |\ \ \ | | | | |/ | | | |/|
| | | * | fix copying webkit guide under windowsOswald Buddenhagen2011-08-171-2/+6
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-171-1/+18
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Symbian: Fix backspace on empty lines of multiline texteditsMiikka Heikkinen2011-08-171-1/+18
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-08-1949-167/+230
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-08-1620-93/+121
| |\ \ \ \ \
| | * | | | | Doc: Fixed qdoc warnings.David Boddie2011-08-1519-90/+120
| | * | | | | Doc: Fixed qdoc warnings.David Boddie2011-08-152-4/+2
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-08-11243-22777/+52301
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Improved comment finding code.David Boddie2011-08-112-24/+41
| | * | | | | Added language information to the pure documentation parser.David Boddie2011-08-112-0/+6
| | * | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-08-08239-22753/+52254
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-08-082-4/+6
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamDavid Boddie2011-08-083-33/+55
| | |\ \ \ \ \ \
| | * | | | | | | qdoc: Fixed a crash caused by accessing a null pointer.David Boddie2011-07-221-2/+3
| | * | | | | | | Doc: Fixed the example of an encoded URL in the class description.David Boddie2011-07-211-2/+3
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-07-292-32/+54
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Doc: Fixes to Qt tutorialGeir Vattekar2011-07-292-32/+54
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-07-2820-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fixed external link to DevNet Wiki.Jerome Pasion2011-07-281-1/+1
| | |/ / / / / /
| | * | | | | | Doc: Added a copy of the online style images for the qdoc manual.David Boddie2011-07-2019-0/+0
| * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-07-201-13/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Doc: Removed the Google Analytics script.David Boddie2011-07-191-13/+1
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-188-15/+36
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-176-12/+35
| |\ \ \ \ \ \ \ \
| | * | | | | | | | uikit: Fixes for Open GL ES 1 and for pre-3GS devicesEike Ziller2011-08-172-6/+27
| | * | | | | | | | uikit: Fix warning.Eike Ziller2011-08-171-1/+1
| | * | | | | | | | Use thumb instructions for uikitEike Ziller2011-08-172-5/+4
| | * | | | | | | | Fix compilation with thumb2.Eike Ziller2011-08-171-0/+2
| | * | | | | | | | Update uikit README: svg works, warn about thumbEike Ziller2011-08-171-3/+4
| * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-16156-5382/+23328
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-08-166-3/+9833
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-08-16150-5377/+13495
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix bidi reordering of RTL text with embedded imagesEskil Abrahamsen Blomfeldt2011-08-161-2/+0
| * | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Fixed infinite loop when loading certain SVGs.Kim Motoyoshi Kalland2011-08-151-1/+1
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-08-1822-87/+112
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'review/master'Sergio Ahumada2011-08-1822-87/+112
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-171-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | test: Fix `tst_qfiledialog' in a namespaced buildSergio Ahumada2011-08-151-0/+2
| | * | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-1218-23/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Fix files that don't end with a newline characterSergio Ahumada2011-08-1218-23/+23
| | * | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-111-63/+70
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | tests: Skip `qaudioinput' tests if there is no audio backend availableSergio Ahumada2011-08-111-63/+70