summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-0723-24/+79
|\
| * Fixes crash in QGraphicsItem's destructor.Yoann Lopes2011-01-072-1/+56
| * 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
| |\ \
| | * \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-01-031-0/+9
| | |\ \
| | | * | Fix crash when closing QFontDialog::getFont() dialogGabriel de Dietrich2011-01-031-0/+9
| | * | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-2354-598/+3351
| | |\ \ \ | | | |/ /
| | | * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-2354-598/+3351
| | | |\ \
| | * | \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-227-123/+228
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-227-123/+228
| | | |\ \ \
| | * | \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-2271-3515/+2235
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-2158-3499/+2125
| | | |\ \ \ \
| | | * | | | | Fix timer warning when deleting item viewsGabriel de Dietrich2010-12-211-2/+9
| | | * | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-2013-14/+101
| | | |\ \ \ \ \
| | * | \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-182-2/+9
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-182-2/+9
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-1711-18/+23
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-1711-18/+23
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-teamQt Continuous Integration System2010-12-1622-281/+92
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-1612-31/+91
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | 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-teamQt Continuous Integration System2010-12-161-2/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Sami Merila2010-12-169-34/+118
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | 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-0721-60/+6905
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | tst_qnetworkreply: Add EXPECT_FAIL for ioGetFromBuiltinHttpMarkus Goetz2011-01-071-0/+2
| * | | | | | | | | | | | | Revert "Fix QNetworkReply autotest cases for QT-3494"Markus Goetz2011-01-071-13/+9
| * | | | | | | | | | | | | 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-0623-70/+6936
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | licensing: exclude generated cookie jar table from license checkPeter Hartmann2011-01-061-1/+3
| | * | | | | | | | | | | | fix include pathMark Brand2011-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-0622-69/+6931
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | 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-0622-69/+6929
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | cookie jar code: enhance security by keeping track of effective TLDsPeter Hartmann2011-01-058-12/+6825
| | | | * | | | | | | | | | | | 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-0513-55/+103
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-0413-55/+103
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-0413-55/+103
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | Fix QNetworkReply autotest cases for QT-3494Ville Pernu2010-12-311-9/+13
| | | | | | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-3112-46/+90
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-3012-46/+90
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | | | | | | | | | | | 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-2311-46/+80
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / | | | | | | | | | |/| | | | | | | | | | |
| | | | | | | | | | * | | | | | | | | | | 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-2310-39/+73
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * | | | | | | | | | | 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-229-38/+68
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |_|_|_|_|_|_|_|_|/ / | | | | | | | | | | | |/| | | | | | | | | |
| | | | | | | | | | | | * | | | | | | | | | Work around an apparent GCC optimiser bug accessing arrays beyond endThiago Macieira2010-12-221-28/+40