summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-196-9/+68
|\
| * Make sure QGraphicsSceneHoverLeave event has non-null widget pointer.Denis Dzyubenko2010-10-195-8/+67
| * Designer: Enable morphing into QTextBrowser.Friedemann Kleint2010-10-191-1/+1
* | 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-15106-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-131-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-1278-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
| | | | | | | | | | | * | Test for absent qmldirAaron Kennedy2010-10-112-0/+3
| | | | | | | | | | | * | Allow objectName to be used in QML bindingsAaron Kennedy2010-10-116-13/+93
| | | | | | | | | | | * | Install the declarative objectNameChanged callbackAaron Kennedy2010-10-112-0/+6
| | | | | | | | | | | * | Don't give focus to a FocusScope that has had focus explicitly cleared.Michael Brasser2010-10-115-7/+64
| | | | | | | | | | | * | Add a declarative callback for when a QObject's objectName changesAaron Kennedy2010-10-112-0/+7
| | | | | | | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0956-51/+562
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0956-51/+562
| | | | | | | | | | | | |\ \
| | | | | | | | | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0856-51/+562
| | | | | | | | | | | | | |\ \
| | | | | | | | | * | | | | | | Update sections if model content changes.Martin Jones2010-10-125-3/+75
| | | | | | | | | | |_|_|_|/ / | | | | | | | | | |/| | | | |
| | | | | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-0854-508/+931
| | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0853-50/+487
| | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | * | | | | | Allow aliases to value type propertiesAaron Kennedy2010-10-0815-12/+147