summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-071-0/+4
| |\ \ \
| | * | | fix build with QT_NO_BEARERMANAGEMENTPeter Hartmann2011-01-071-0/+4
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-0722-24/+26
| |\ \ \ \
| | * | | | Fixes crash in QGraphicsItem's destructor.Yoann Lopes2011-01-071-1/+3
| | * | | | Doc: Fixing typoSergio Ahumada2011-01-0721-23/+23
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-01-0713-254/+21
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Merge branch 'review-4.7' into staging-4.7Gabriel de Dietrich2011-01-0713-254/+21
| | |\ \ \ \
| | | * | | | Fix crash when closing QFontDialog::getFont() dialogGabriel de Dietrich2011-01-031-0/+9
| | | * | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-2316-68/+226
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-223-29/+120
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-218-52/+87
| | | |\ \ \ \ \ \
| | | * | | | | | | Fix timer warning when deleting item viewsGabriel de Dietrich2010-12-211-2/+9
| | | * | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-205-8/+27
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-181-1/+2
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-174-1/+8
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-167-26/+36
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Remove support for automatic tactile feedback from QS60StyleSami Merila2010-12-1610-250/+1
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Sami Merila2010-12-167-32/+116
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Remove warning about null cursor handle on S60 while handle is validPaul Labedan2010-12-151-2/+2
| * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-0713-55/+6619
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Revert "QNAM HTTP: Fix missing error() signal"Markus Goetz2011-01-072-20/+1
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-0615-56/+6639
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-0615-56/+6639
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | fix build with namespaces in new cookie jar tablePeter Hartmann2011-01-061-0/+2
| | | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-0615-56/+6637
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | cookie jar code: enhance security by keeping track of effective TLDsPeter Hartmann2011-01-055-12/+6551
| | | | | * | | | | | | | | | | | Add support for QMetaType::QVariant in ActiveQtPrasanth Ullattil2011-01-051-2/+1
| | | | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-049-42/+85
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-309-42/+85
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | Add compiler optimization for QtScript/JSC on SymbianKent Hansen2010-12-281-0/+10
| | | | | | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-238-42/+75
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|_|_|_|_|/ / / | | | | | | | |/| | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | improve performance of QTextEngine, esp. setBoundary by using non-detaching o...Milian Wolff2010-12-231-7/+7
| | | | | | | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-237-35/+68
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | | | | | | | | | | Improve docs for QTEST_MAIN macro.Jason McDonald2010-12-231-1/+5
| | | | | | | | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-226-34/+63
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |_|_|_|_|_|_|_|/ / / | | | | | | | | | |/| | | | | | | | | |
| | | | | | | | | | * | | | | | | | | | Work around an apparent GCC optimiser bug accessing arrays beyond endThiago Macieira2010-12-221-28/+40
| | | | | | | | | | * | | | | | | | | | Do not crash in case a future version of libdbus has a new kind of message.Thiago Macieira2010-12-221-3/+1
| | | | | | | | | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Peter Yard2010-12-2263-220/+516
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-213-2/+21
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |_|_|_|_|_|_|/ / / | | | | | | | | | | | |/| | | | | | | | |
| | | | | | | | | | | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-213-2/+21
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-203-2/+21
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | |_|_|_|_|_|/ / / | | | | | | | | | | | | | |/| | | | | | | |
| | | | | | | | | | | | | | * | | | | | | | Fixed QStatusBar not to repaint itself too earlyDenis Dzyubenko2010-12-201-1/+1
| | | | | | | | | | | | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Ville Pernu2010-12-205-1/+11
| | | | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | | * | | | | | | | | QNAM HTTP: Fix missing error() signalVille Pernu2010-12-202-1/+20
| | | | | | | | | | * | | | | | | | | | | | | Docs: QTBUG-9150 Incorrect snippet in class doc.Peter Yard2010-12-221-1/+1
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-01-121-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Mac: pixmaps dont treat alpha exactly the same as other platformsRichard Moe Gustavsen2011-01-121-1/+5
* | | | | | | | | | | | | | | | | | | | | | | | Doc: Fixing typoSergio Ahumada2011-01-121-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2011-01-1114-26/+238
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2011-01-1114-26/+238
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \