summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-3121-62/+78
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-08-3117-34/+44
| |\
| | * Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-2970-405/+833
| | |\
| | * \ Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-2646-174/+336
| | |\ \
| | * | | Disable activeqt on win32-g++ (it doesn't build).Ray Donnelly2011-08-221-1/+1
| | * | | Make the DBus timeout configurable in QDBusAbstractInterface.David Faure2011-08-193-4/+31
| | * | | Revert "Fix build with the Clang compiler"Tor Arne Vestbø2011-08-181-3/+3
| | * | | Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'suzuki toshiya2011-08-1812-19/+19
| | * | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-1854-3018/+7923
| | |\ \ \
| | * | | | Fix build with the Clang compilerTor Arne Vestbø2011-08-161-3/+3
| | * | | | Add support for rawFonts loaded from data in FaceIdPierre Rossi2011-08-152-1/+4
| | * | | | directfb: Include directfbgl.h directlyHolger Hans Peter Freyther2011-08-121-1/+1
| | * | | | don't detach until the list is going to be modifiedRitt Konstantin2011-08-121-1/+0
| | * | | | optimize QList::removeAll()Ritt Konstantin2011-08-121-11/+19
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-08-301-10/+12
| |\ \ \ \ \
| | * | | | | QSslCertificate: also check common name for blacklisted certificatesPeter Hartmann2011-08-301-11/+12
| | * | | | | QSslCertificate: blacklist fraudulent *.google.comPeter Hartmann2011-08-301-0/+1
| * | | | | | 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-302-18/+20
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | QDeclarative::hasActiveFocus should return false for hidden itemsAlan Alpert2011-08-301-2/+2
| | * | | | | | FocusScope's focusItem must always be a descendentAlan Alpert2011-08-301-16/+18
* | | | | | | | Merge branch '4.8'Casper van Donderen2011-08-301-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Doc: Internalized QDeclarativeTypeLoaderGeir Vattekar2011-08-241-0/+5
| * | | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-06-17110-719/+1039
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-06-09239-5756/+8408
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-30657-8818/+20058
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'review/master'Sergio Ahumada2011-08-29475-4848/+10383
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Do not unconditionally use pkg-config in .pro filesRohan McGovern2011-08-263-3/+3
| | * | | | | | | | | | 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 scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | Fix conversion of QAbstractItemModel::rowsMoved() parametersBea Lam2011-08-291-1/+1
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-08-2810-3/+107
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-23136-3683/+8870
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix warning about missing qs60keycapture_p.h header in guiMiikka Heikkinen2011-08-101-2/+1
| | * | | | | | | | | | | Fixed Symbian memory leak in utcToLocal(QDate &, QTime &)mread2011-08-051-1/+4
| | * | | | | | | | | | | DEF file freezemread2011-08-048-0/+102
| * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-2818-89/+319
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | 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 scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-08-2416-75/+303
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | 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
| | | * | | | | | | | | | | | uikit: fix examples to no longer ship the custom fontsEike Ziller2011-08-242-12/+0