summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-22630-4274/+10000
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-2116-13/+298
| |\
| | * Fix compilation with QT_NO_KEYWORDSOlivier Goffart2010-10-211-1/+1
| | * Replaced sample text for Japanese fontTasuku Suzuki2010-10-201-4/+6
| | * Fix the #ifdef position.Fabien Freling2010-10-203-4/+7
| | * Deactivate the auto-test on problematic platforms.Alexis Menard2010-10-201-0/+3
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-1914-9/+286
| | |\ | |/ /
| | * Enable the unified toolbar with the rasterFabien Freling2010-10-196-4/+20
| | * configure: Don't use character class when looking for QMAKE_CONF_COMPILERTor Arne Vestbø2010-10-191-1/+1
| | * Moving the resetInternalData slot to QAbstractProxyModelGabriel de Dietrich2010-10-194-26/+26
| | * Provide the resetInternalData slot to cleanly reset data in proxy subclasses.Stephen Kelly2010-10-194-0/+198
| | * Emit beginResetModel before updating the strings.Stephen Kelly2010-10-191-1/+2
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-192-2/+64
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-182-2/+64
| | | |\
| | | | * Send the hoverLeave not properly sent on the widget inside QGPW.Alexis Menard2010-10-182-2/+64
| * | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-19100-606/+1580
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix CI by recreating reference bitmaps for text comparisonJoona Petrell2010-10-199-0/+0
| | * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-19106-606/+1580
| | |\ \ \ | |/ / / /
| | * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-18106-606/+1580
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-16106-606/+1580
| | | |\ \ | | | | |/ | | | |/|
| | | | * tst_qdeclarativetext: Regenerate the baselines after the merge.Olivier Goffart2010-10-159-0/+0
| | | | * Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-15100-606/+1580
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-141-0/+7
| | | | | |\
| | | | | | * Giving Qt a default app server when Avkon is removedmread2010-10-141-0/+7
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-144-2/+113
| | | | | |\ \ | | | | | | |/ | | | | | |/|
| | | | | | * TextInput autoscroll now scrolls when the cursor movesAlan Alpert2010-10-141-0/+1
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-10-141-0/+108
| | | | | | |\
| | | | | | | * Add new behavior example.Yann Bodson2010-10-141-0/+108
| | | | | | |/ | | | | | |/|
| | | | | | * Fix samegame tutorial jsAlan Alpert2010-10-141-1/+1
| | | | | | * Make minehunt less cheerfulAlan Alpert2010-10-141-1/+3
| | | | | |/
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1385-555/+1391
| | | | | |\
| | | | | | * Fix autotest on windowsAaron Kennedy2010-10-131-1/+3
| | | | | | * Fix worker ListModels to property emit countChanged()Bea Lam2010-10-132-1/+11
| | | | | | * Update color type docs to mention transparencyBea Lam2010-10-131-0/+2
| | | | | | * Update reference bitmaps used in bitmap comparison tests to follow changes in...Joona Petrell2010-10-133-0/+0
| | | | | | * Fix alignment bugs in Text elementAaron Kennedy2010-10-132-481/+524
| | | | | | * Remove debug code added by 650a0078e2cef43eff107fe8d2505f64a0bfedf0Martin Jones2010-10-131-3/+0
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1378-74/+856
| | | | | | |\
| | | | | | | * Compile on WinCEAaron Kennedy2010-10-133-6/+6
| | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1378-74/+856
| | | | | | | |\
| | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1278-74/+856
| | | | | | | | |\
| | | | | | | | | * Update QtDeclarative def filesJoona Petrell2010-10-122-0/+2
| | | | | | | | | * Update QtCore def filesJoona Petrell2010-10-122-0/+2
| | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1274-74/+852
| | | | | | | | | |\
| | | | | | | | | | * Compile on MSVC2008Aaron Kennedy2010-10-121-3/+2
| | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-122-0/+26
| | | | | | | | | | |\
| | | | | | | | | | | * Bug: TextEdit ignores plain text format when pasting textYann Bodson2010-10-122-0/+26
| | | | | | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-1235-66/+393
| | | | | | | | | | |\ \ | | | | | | | | | | | |/
| | | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1169-71/+752
| | | | | | | | | | | |\
| | | | | | | | | | | | * Fix autotest on windowsAaron Kennedy2010-10-112-1/+18
View Lorry Controller Status