summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-08-3011-100/+132
|\
| * QSslCertificate: also check common name for blacklisted certificatesPeter Hartmann2011-08-301-11/+12
| * QSslCertificate: regenerate blacklisted certificates, they were expiredPeter Hartmann2011-08-309-90/+90
| * QSslCertificate: blacklist fraudulent *.google.comPeter Hartmann2011-08-302-0/+31
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-08-301-0/+2
|\ \
| * | Doc: added since tag to QDateTime::msecsToJoerg Bornemann2011-08-301-0/+2
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-304-18/+65
|\ \ \ | |/ / |/| |
| * | QDeclarative::hasActiveFocus should return false for hidden itemsAlan Alpert2011-08-302-2/+15
| * | FocusScope's focusItem must always be a descendentAlan Alpert2011-08-302-16/+50
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-08-29476-4848/+10387
|\ \ \
| * \ \ Merge remote-tracking branch 'review/master'Sergio Ahumada2011-08-29476-4848/+10387
| |\ \ \ |/ / / /
| * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-08-271115-43996/+68466
| |\ \ \
| | * | | Do not unconditionally use pkg-config in .pro filesRohan McGovern2011-08-264-3/+7
| | * | | Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427eAdemar de Souza Reis Jr2011-08-268-78/+69
| | * | | Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fdAdemar de Souza Reis Jr2011-08-258-2/+14
| | * | | Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0Ademar de Souza Reis Jr2011-08-2547-71/+1312
| | * | | Updated WebKit to 4277f8277b1daf3ec33c996f5a760ccd1113af4bAdemar de Souza Reis Jr2011-08-18301-22/+392
| | * | | Updated WebKit to 8ed79cb10ca72b5d240beae674a7932963cbd007Ademar de Souza Reis Jr2011-08-114-2/+12
| | * | | Updated WebKit to 66b76cdb8ef823f27a8229c5cae2d35e7f2d3c59Ademar de Souza Reis Jr2011-08-11139-4752/+8663
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-07-0262-274/+532
| |\ \ \ \
* | \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-292-4/+77
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Fix conversion of QAbstractItemModel::rowsMoved() parametersBea Lam2011-08-292-4/+77
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-08-2816-23/+158
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-08-23218-3951/+19270
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-23218-3951/+19270
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-08-183-0/+33
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Default graphics memory quota for Symbian applicationsMiikka Heikkinen2011-08-183-0/+33
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-08-101-2/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fix warning about missing qs60keycapture_p.h header in guiMiikka Heikkinen2011-08-101-2/+1
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-08-052-17/+20
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Reimplement MR1271 over coda patchShane Kearns2011-08-051-16/+16
| | * | | | | | | Fixed Symbian memory leak in utcToLocal(QDate &, QTime &)mread2011-08-051-1/+4
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-08-0510-4/+104
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fix bad merge on a couple of xml examplesMiikka Heikkinen2011-08-052-4/+2
| | * | | | | | | DEF file freezemread2011-08-048-0/+102
* | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-280-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-271-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-261-0/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Porting the QTBUG-21084 fix to 4.7.4mread2011-08-261-0/+1
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-2818-89/+319
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-252-14/+16
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | uikit: get rid of the "min 30fps" for event handling.Eike Ziller2011-08-251-9/+2
| | * | | | | | | | | | | | uikit: update READMEEike Ziller2011-08-251-5/+14
| * | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-24102-352/+732
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-08-2416-75/+303
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-243-21/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Fix QGLGlyphCache for Open GL ES (1).Eike Ziller2011-08-241-15/+20
| | * | | | | | | | | | | | | Revert "Include trailing space width in RTL text line width"Eskil Abrahamsen Blomfeldt2011-08-241-5/+1
| | * | | | | | | | | | | | | Fix justification of RTL textEskil Abrahamsen Blomfeldt2011-08-241-1/+2
| * | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-2413-54/+280
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /