summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-10-1511-8/+170
|\
| * Keep qmlviewer from disappearingAlan Alpert2010-10-151-0/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-10-153-0/+142
| |\
| | * Additional autotests for VisualDataModel.Michael Brasser2010-10-153-0/+142
| * | Update some tests to modern syntaxAlan Alpert2010-10-152-2/+2
| |/
| * Actually call update in the Text ElementAlan Alpert2010-10-151-0/+1
| * Snake demo now pauses when the window loses focus.Alan Alpert2010-10-153-3/+13
| * Recalculate Text Element's alignment when width changesAlan Alpert2010-10-151-3/+4
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1420-156/+366
| |\
| * \ 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
| |\ \ \ | | |/ / | |/| |
* | | | Fix potential memory corruption in QDeclarativePropertyCacheAaron Kennedy2010-10-141-4/+7
| |_|/ |/| |
* | | Correctly splice properties from derived metaobjects togetherAaron Kennedy2010-10-146-58/+61
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-1422-550/+702
|\ \ \
| * | | Optimization: Don't generate intermediate QDeclarativeComponent'sAaron Kennedy2010-10-148-64/+48
| | |/ | |/|
| * | 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
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-131-1/+1
| |\ \
| | * | Added --remove-destination to qmake_emulator_deployment.flmMiikka Heikkinen2010-10-131-1/+1
* | | | Fix consistency of setting currentIndex in ListView and GridView.Martin Jones2010-10-146-34/+257
| |_|/ |/| |
* | | 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
| | | | | | |\ \