summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | Allow overloaded methods, and methods with default params, to be called in QMLAaron Kennedy2010-10-155-28/+382
| | * | | | | | | | | | | | | | | | | | 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
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | | | | | | | | Fix consistency of setting currentIndex in ListView and GridView.Martin Jones2010-10-146-34/+257
* | | | | | | | | | | | | | | | | | | | | Fixed case of a library file name to enable MinGW builds on Fedora.David Boddie2010-10-201-2/+2
* | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-1513-20/+164
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-10-1512-19/+163
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | Changed language of the AutoConnection description.Jerome Pasion2010-10-151-5/+5
| | * | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-154-9/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'small' into 4.7Morten Engvoldsen2010-10-154-9/+30
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | Doc: Clearing details around default settings.Morten Engvoldsen2010-10-141-0/+1
| | | | * | | | | | | | | | | | | | | | | | | | Doc: making links more visible when they are visited.Morten Engvoldsen2010-10-141-0/+9
| | | | * | | | | | | | | | | | | | | | | | | | Doc: Fixing doc bugs for the symbian platformMorten Engvoldsen2010-10-141-9/+18
| | | | * | | | | | | | | | | | | | | | | | | | Doc: Adding note to tier 2: The ppc architecture on Mac has been downgraded f...Morten Engvoldsen2010-10-141-0/+2
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Changed Javascript guide link in Intro to the QML Language page.Jerome Pasion2010-10-152-3/+8
| | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-145-2/+120
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| / / / / / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | 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
| | | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Doc: fixing unclosed <p>Morten Engvoldsen2010-10-151-1/+1
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-14157-1131/+2406
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-1395-604/+1460
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | 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