Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04. | Yann Bodson | 2010-03-18 | 7 | -0/+0 |
| | |||||
* | Don't use QScriptValueIterator to iterate over arrays. | Bea Lam | 2010-03-18 | 1 | -4/+3 |
| | |||||
* | Skip test, to be fixed. | Bea Lam | 2010-03-18 | 1 | -0/+2 |
| | |||||
* | Only release the binding once we're finished with its memory | Aaron Kennedy | 2010-03-18 | 1 | -1/+1 |
| | |||||
* | Make it harder to accidentally delete a binding | Aaron Kennedy | 2010-03-18 | 1 | -5/+7 |
| | |||||
* | Adjust test now that redundant contexts are not create due | Warwick Allison | 2010-03-18 | 1 | -2/+2 |
| | | | | to commit 26cd94ef47ffc969dc835e98b58eded14e669964. | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-03-18 | 25 | -62/+73 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-18 | 24 | -38/+39 |
| |\ | |||||
| | * | Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04. | Michael Brasser | 2010-03-18 | 24 | -38/+39 |
| | | | | | | | | | | | | | | | The import order has changed, so test files that mirror element names needed to be renamed (or they would resolve as the type). | ||||
| * | | Don't destroy cookie jar until while someone may be using it. | Martin Jones | 2010-03-18 | 1 | -24/+34 |
| |/ | |||||
* | | Block modifications to internal QDeclarativeContexts | Aaron Kennedy | 2010-03-18 | 2 | -1/+50 |
|/ | |||||
* | Another fix to find | mae | 2010-03-17 | 1 | -3/+5 |
| | | | | | Do not try to instantiate types that are explicitely forbidden in the qmldir (because the version does not match). | ||||
* | Improve implicit "." import | mae | 2010-03-17 | 2 | -16/+28 |
| | | | | | | The change moves the implicit "." import to the very end, i.e. the first lookup. It also gets the content of a remote qmldir from the resources. | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-17 | 265 | -3662/+7109 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (132 commits) Fix auto test Fix type lookup with url Fix default values on Textinput Add an implicit import "." to types loaded from a local url Fix crash Don't use Qt3 support methods. Crash Add/delete albums in photoviewer. Emits itemsRemoved() in QDeclarativeListModel::remove. Readd the itemtree benchmarks for comparison purposes. Allow enum constants as list element properties. Compile Cleanup benchmark a little Really fix warning. Fix warnings. MouseArea works now with any QGraphicsObject Make states test work with smaller font size. Register QGraphicsWidget type. Add ListView and GridView.indexAt() methods to get the index at a point. Tests for default count(), get() values should be run on the worker ... | ||||
| * | Fix auto test | mae | 2010-03-17 | 1 | -8/+8 |
| | | | | | | | | | | This repairs 9727cb35b30e07d1f72100a39c8d23e438e2746c. The lookup can only happen if we have a file import (and not a library import) | ||||
| * | Fix type lookup with url | mae | 2010-03-17 | 1 | -8/+8 |
| | | | | | | | | | | | | The existence of a non-empty qmldir file (e.g. for defining a plugin) should not change the lookup rules for qml files via url | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Alan Alpert | 2010-03-17 | 493 | -12162/+25145 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/declarative/util/qdeclarativelistmodel.cpp tools/qml/qml.pro | ||||
| * | | Fix default values on Textinput | Alan Alpert | 2010-03-17 | 1 | -0/+3 |
| | | | | | | | | | | | | Task-number: BAUHAUS-389 | ||||
| * | | Add an implicit import "." to types loaded from a local url | mae | 2010-03-17 | 2 | -4/+28 |
| | | | | | | | | | | | | | | | | | | This triggers the loading of the qmldir and the import of native types from available plugins. The change puts native types on par with types defined in qml files. | ||||
| * | | Fix crash | Aaron Kennedy | 2010-03-17 | 3 | -8/+9 |
| | | | | | | | | | | | | | | | | | | If the notifier gets swapped out during emitting, the endpoint is also invalidated. Thus the "disconnected" writeback must track the endpoint not just the Notifier. | ||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-17 | 6 | -38/+111 |
| |\ \ | |||||
| | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Yann Bodson | 2010-03-17 | 2 | -9/+19 |
| | |\ \ | |||||
| | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Yann Bodson | 2010-03-17 | 13 | -155/+179 |
| | |\ \ \ | |||||
| | * | | | | Add/delete albums in photoviewer. | Yann Bodson | 2010-03-17 | 5 | -24/+95 |
| | | | | | | |||||
| | * | | | | Emits itemsRemoved() in QDeclarativeListModel::remove. | Yann Bodson | 2010-03-17 | 1 | -14/+16 |
| | | | | | | |||||
| * | | | | | Don't use Qt3 support methods. | Martin Jones | 2010-03-17 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
| * | | | | Crash | Aaron Kennedy | 2010-03-17 | 2 | -9/+19 |
| | |/ / | |/| | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-17 | 1 | -0/+102 |
| |\ \ \ | |||||
| | * | | | Readd the itemtree benchmarks for comparison purposes. | Michael Brasser | 2010-03-17 | 1 | -0/+102 |
| | | | | | |||||
| * | | | | Allow enum constants as list element properties. | Warwick Allison | 2010-03-17 | 6 | -6/+63 |
| |/ / / | | | | | | | | | | | | | Task-number: QTBUG-5974 | ||||
| * | | | Compile | Aaron Kennedy | 2010-03-17 | 6 | -5/+6 |
| | | | | |||||
| * | | | Cleanup benchmark a little | Aaron Kennedy | 2010-03-17 | 1 | -232/+96 |
| |/ / | |||||
| * | | Really fix warning. | Martin Jones | 2010-03-17 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-17 | 5 | -10/+11 |
| |\ \ | |||||
| | * | | MouseArea works now with any QGraphicsObject | Alexis Menard | 2010-03-17 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | Easy, you just need to change the property. Reviewed-by:Martin Jones | ||||
| | * | | Make states test work with smaller font size. | Martin Jones | 2010-03-17 | 2 | -4/+4 |
| | | | | |||||
| | * | | Register QGraphicsWidget type. | Alexis Menard | 2010-03-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Reviewed-by:TrustMe | ||||
| * | | | Fix warnings. | Martin Jones | 2010-03-17 | 2 | -2/+2 |
| |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-17 | 44 | -611/+860 |
| |\ \ | |||||
| | * \ | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2010-03-17 | 39 | -576/+827 |
| | |\ \ | |||||
| | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-17 | 258 | -3490/+6750 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (112 commits) Verbose unexpected errors. One url for an *unqualilfied* import is not special. Fix test failures Optimization: Don't unnecessarily run VMEStack element constructors Optimization: Reduce unnecessary QObject allocations Reset QDeclarativeDeclarativeData::outerContext when the context is removed Simplify QDeclarativeComponent::creationContext() logic Optimization: Use id notifier for QtScript bindings Optimization: Combine QDeclarativeDeclarativeData and QObject allocations Fixes for the module import Fix documentation add alan's tic-tac-toe AI Remove test in .pro file also Remove unneeded #include and add needed header to .pri Add easing changes to QmlChanges.txt Update more animation on property value source docs. Doc fixes. QmlChanges.txt cleanup. Remove WorkerListModel and integrate its functionality into ListModel. Split post alpha API changes into a separate section. ... | ||||
| | | | * | | Verbose unexpected errors. | Warwick Allison | 2010-03-17 | 1 | -2/+1 |
| | | | | | | |||||
| | | | * | | One url for an *unqualilfied* import is not special. | Warwick Allison | 2010-03-17 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Stops tst_qdeclarativelanguage passing when network transparency breaks. | ||||
| | | | * | | Fix test failures | Aaron Kennedy | 2010-03-17 | 6 | -6/+11 |
| | | | | | | |||||
| | | | * | | Optimization: Don't unnecessarily run VMEStack element constructors | Aaron Kennedy | 2010-03-17 | 1 | -4/+4 |
| | | | | | | |||||
| | | | * | | Optimization: Reduce unnecessary QObject allocations | Aaron Kennedy | 2010-03-17 | 31 | -550/+740 |
| | | | | | | |||||
| | | | * | | Reset QDeclarativeDeclarativeData::outerContext when the context is removed | Aaron Kennedy | 2010-03-17 | 1 | -0/+1 |
| | | | | | | |||||
| | | | * | | Simplify QDeclarativeComponent::creationContext() logic | Aaron Kennedy | 2010-03-17 | 1 | -5/+2 |
| | | | | | | |||||
| | | | * | | Optimization: Use id notifier for QtScript bindings | Aaron Kennedy | 2010-03-17 | 3 | -5/+33 |
| | | | | | | |||||
| | | | * | | Optimization: Combine QDeclarativeDeclarativeData and QObject allocations | Aaron Kennedy | 2010-03-17 | 5 | -5/+30 |
| | | | | | |