summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Block modifications to internal QDeclarativeContextsAaron Kennedy2010-03-182-1/+50
|
* Another fix to findmae2010-03-171-3/+5
| | | | | Do not try to instantiate types that are explicitely forbidden in the qmldir (because the version does not match).
* Improve implicit "." importmae2010-03-172-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-integrationQt Continuous Integration System2010-03-17265-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 testmae2010-03-171-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 urlmae2010-03-171-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.7Alan Alpert2010-03-17493-12162/+25145
| |\ | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/declarative/util/qdeclarativelistmodel.cpp tools/qml/qml.pro
| * | Fix default values on TextinputAlan Alpert2010-03-171-0/+3
| | | | | | | | | | | | Task-number: BAUHAUS-389
| * | Add an implicit import "." to types loaded from a local urlmae2010-03-172-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 crashAaron Kennedy2010-03-173-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.7Martin Jones2010-03-176-38/+111
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-172-9/+19
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-1713-155/+179
| | |\ \ \
| | * | | | Add/delete albums in photoviewer.Yann Bodson2010-03-175-24/+95
| | | | | |
| | * | | | Emits itemsRemoved() in QDeclarativeListModel::remove.Yann Bodson2010-03-171-14/+16
| | | | | |
| * | | | | Don't use Qt3 support methods.Martin Jones2010-03-171-1/+1
| | |_|/ / | |/| | |
| * | | | CrashAaron Kennedy2010-03-172-9/+19
| | |/ / | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-171-0/+102
| |\ \ \
| | * | | Readd the itemtree benchmarks for comparison purposes.Michael Brasser2010-03-171-0/+102
| | | | |
| * | | | Allow enum constants as list element properties.Warwick Allison2010-03-176-6/+63
| |/ / / | | | | | | | | | | | | Task-number: QTBUG-5974
| * | | CompileAaron Kennedy2010-03-176-5/+6
| | | |
| * | | Cleanup benchmark a littleAaron Kennedy2010-03-171-232/+96
| |/ /
| * | Really fix warning.Martin Jones2010-03-171-2/+2
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-175-10/+11
| |\ \
| | * | MouseArea works now with any QGraphicsObjectAlexis Menard2010-03-172-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Easy, you just need to change the property. Reviewed-by:Martin Jones
| | * | Make states test work with smaller font size.Martin Jones2010-03-172-4/+4
| | | |
| | * | Register QGraphicsWidget type.Alexis Menard2010-03-171-0/+1
| | | | | | | | | | | | | | | | Reviewed-by:TrustMe
| * | | Fix warnings.Martin Jones2010-03-172-2/+2
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-1744-611/+860
| |\ \
| | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-1739-576/+827
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-17258-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 Allison2010-03-171-2/+1
| | | | | |
| | | | * | One url for an *unqualilfied* import is not special.Warwick Allison2010-03-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Stops tst_qdeclarativelanguage passing when network transparency breaks.
| | | | * | Fix test failuresAaron Kennedy2010-03-176-6/+11
| | | | | |
| | | | * | Optimization: Don't unnecessarily run VMEStack element constructorsAaron Kennedy2010-03-171-4/+4
| | | | | |
| | | | * | Optimization: Reduce unnecessary QObject allocationsAaron Kennedy2010-03-1731-550/+740
| | | | | |
| | | | * | Reset QDeclarativeDeclarativeData::outerContext when the context is removedAaron Kennedy2010-03-171-0/+1
| | | | | |
| | | | * | Simplify QDeclarativeComponent::creationContext() logicAaron Kennedy2010-03-171-5/+2
| | | | | |
| | | | * | Optimization: Use id notifier for QtScript bindingsAaron Kennedy2010-03-173-5/+33
| | | | | |
| | | | * | Optimization: Combine QDeclarativeDeclarativeData and QObject allocationsAaron Kennedy2010-03-175-5/+30
| | | | | |
| | * | | | Tests for default count(), get() values should be run on the workerBea Lam2010-03-175-35/+33
| | | |/ / | | |/| | | | | | | | | | | | | | | | | list model instead of being ignored. Also do some cleaning up in the list model.
| * | | | Add ListView and GridView.indexAt() methods to get the index at a point.Martin Jones2010-03-174-13/+65
| |/ / /
| * | | Fixes for the module importmae2010-03-162-38/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change makes import "url" also load plugins. We know must decide on the preferred coding style. Since native types must be registered with a unique uri, we now generate a stable uri from the plugin path and the import paths. This way we do not have to call registerTypes() multiple times.
| * | | Fix documentationmae2010-03-162-4/+4
| | | |
| * | | add alan's tic-tac-toe AImae2010-03-163-7/+151
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-16241-2984/+5781
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (100 commits) 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. Optimize drawPixmapFragments for the GL2 paint engine. Optimize QRegion::intersects(QRect). Compile with user defined Qt namespace Fix regression from previous commit Import "content" with as qualifier to support network without qmldir Small fixes to photoviewer demo Little more doc on QabstractItemModel and QML. Fix benchmark. Add basic QUrl benchmarks. Add busy indicator to photoviewer demo Set maximumExtents correctly for highlightRangeMode: StrictlyEnforceRange fix installation of imports libraries ...
| | * | | Remove test in .pro file alsoAlan Alpert2010-03-161-1/+0
| | | | |
| | * | | Remove unneeded #include and add needed header to .priMartin Jones2010-03-162-2/+1
| | | | |
| | * | | Add easing changes to QmlChanges.txtMartin Jones2010-03-161-0/+8
| | | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-1620-1220/+1549
| | |\ \ \