summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-231-1/+2
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix compilation with namespace.
| * Fix compilation with namespace.ck2010-02-231-1/+2
| |
* | Merge remote branch 'origin/master'Thiago Macieira2010-02-2387-1670/+1363
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc doc/src/declarative/tutorial2.qdoc doc/src/declarative/tutorial3.qdoc src/declarative/graphicsitems/qmlgraphicsmousearea.cpp src/multimedia/playback/qmediaplayer.cpp
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-231-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: clean up x11 desktop detection avoid double reallocations in inserting operations create temporaries more intelligently do not protect against self-assignment in QList::replace() make queues to which only lists are appended not blow the memory optimize queue-like structures remove more pointless recalculations Fix compilation with namespace. Fix compilation with namespace.
| | * Fix compilation with namespace.ck2010-02-221-2/+2
| | |
| * | Make uncached text painting work for richtext too.Martin Jones2010-02-232-3/+12
| | |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2264-1432/+1123
| |\ \
| | * | Replace QmlList* and QList* support with a single QmlListProperty typeAaron Kennedy2010-02-2264-1432/+1123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a value type QmlListProperty doesn't consume any memory in the object. It also has a companion QmlListReference class that is part of the public API for C++ developers to interact with that also manages memory issues that existed with previous solutions (if the containing QObject was destroyed it left a dangling pointer).
| * | | Remove race condition in remote pixmap cancelling.Martin Jones2010-02-221-17/+12
| |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-221-0/+5
| |\ \
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMichael Brasser2010-02-2210-93/+83
| | |\ \
| | * | | Update QmlChanges with animation API changes.Michael Brasser2010-02-221-0/+5
| | | |/ | | |/|
| * | | Rename MouseRegion -> MouseAreaMartin Jones2010-02-2214-124/+127
| | |/ | |/|
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-227-66/+65
| |\ \
| | * | Fix compile error on SolarisAaron Kennedy2010-02-227-66/+65
| | |/ | | | | | | | | | | | | QTBUG-8267. Remove templating from QmlTimeLineEvent class (and rename it to QmlTimeLineCallback to more represent what it is).
| * | Document the default velocity of EaseFollowMartin Jones2010-02-221-1/+10
| | | | | | | | | | | | Task-number: QTBUG-8181
| * | Remove use of unexprted private classes.Martin Jones2010-02-222-26/+8
| |/
* | doc: Fixed some qdoc errors.Martin Smith2010-02-221-2/+2
| |
* | Merge remote branch 'origin/master'Thiago Macieira2010-02-2095-1911/+2734
|\ \ | |/ | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc
| * Revert "Speed up QmlGraphicsItem::setParentItem."Bjørn Erik Nilsen2010-02-191-5/+1
| | | | | | | | | | | | | | | | | | This reverts commit 282a46ab5edafa7b82e9c58658143cb979db2d85. This change introduced some regression due to itemChange notifications not being delivered as expected (reported by Warwick). We have to find another solution, unfortunately. However, the performance penalty isn't that big so we can live with it for now.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-191-3/+6
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-192-8/+1
| | |\
| | * | Delete the QmlImageRequestHandler in the correct thread.Martin Jones2010-02-191-3/+6
| | | |
| * | | More strict type checking of ListElement properties.Warwick Allison2010-02-192-10/+40
| | |/ | |/| | | | | | | Task-number: QTBUG-6203
| * | Fix "AnimatedImage ignores Anchors setting"Michael Brasser2010-02-191-0/+1
| | | | | | | | | | | | Task-number: QTBUG-8343
| * | Remove unused function that breaks build on AIX.Michael Brasser2010-02-191-8/+0
| |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-18298-334/+350
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/linux-g++-x11egl/qplatformdefs.h src/declarative/qml/qmldom.h src/declarative/util/qmlview.cpp src/declarative/util/qmlview.h tools/qdoc3/cppcodemarker.cpp tools/qmldebugger/standalone/canvasframerate.cpp tools/qmldebugger/standalone/engine.cpp tools/qmldebugger/standalone/expressionquerywidget.cpp tools/qmldebugger/standalone/expressionquerywidget.h tools/qmldebugger/standalone/objectpropertiesview.cpp tools/qmldebugger/standalone/objectpropertiesview.h tools/qmldebugger/standalone/objecttree.cpp tools/qmldebugger/standalone/qmldebugger.cpp tools/qmldebugger/standalone/watchtable.cpp tools/qmldebugger/standalone/watchtable.h
| * | Make QmlDom API internalKai Koehne2010-02-185-409/+420
| | | | | | | | | | | | | | | | | | | | | It's still used by QmlDesigner, therefore the symbols have to be exported. Task-number: QTBUG-6845
| * | Compile fix with namepaceshjk2010-02-183-1/+9
| | | | | | | | | | | | Task-number: QTBUG-8205
| * | Removed incorrect Q_UNUSED() macro from QmlPropertyAnimation::transitionLeonardo Sobral Cunha2010-02-181-1/+0
| | |
| * | Doc: onExited, onEntered only work when button pressed or hoverEnabledMartin Jones2010-02-181-0/+16
| | | | | | | | | | | | Task-number: QTBUG-8305
| * | Ensure visibleIndex and currentIndex are updated on itemsMoved().Martin Jones2010-02-181-2/+25
| | |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-188-480/+583
| |\ \
| | * | Animation doc fix.Michael Brasser2010-02-181-24/+11
| | | |
| | * | Add a RotationAnimation element.Michael Brasser2010-02-183-0/+223
| | | | | | | | | | | | | | | | | | | | This is needed to provide more control of rotation direction when animating.
| | * | Remove unneeded comparison.Michael Brasser2010-02-181-1/+1
| | | | | | | | | | | | | | | | d->propertyName is now included in props.
| | * | Fix bugs and add tests related to manual start/stop control of animations.Michael Brasser2010-02-182-10/+12
| | | | | | | | | | | | | | | | | | | | This better enforces the restriction on starting an animation that is not top-level, or is part of a Transition or Behavior.
| | * | Transitions and Behaviors should exclusively control their animations.Michael Brasser2010-02-185-8/+25
| | | | | | | | | | | | | | | | | | | | Don't allow manual control (starting, stopping, etc) of animations in a Behavior or Transition.
| | * | Animation's setTarget should only be called via QmlValueSource*.Michael Brasser2010-02-181-1/+3
| | | | | | | | | | | | | | | | | | | | We rely on this to know whether to autostart. Disallow easy access to setTarget by making it private.
| | * | Minor transition cleanup.Michael Brasser2010-02-181-7/+1
| | | |
| | * | Minor animation class cleanup.Michael Brasser2010-02-183-29/+25
| | | |
| | * | Get rid of the matchProperties/properties distinction, as itMichael Brasser2010-02-187-438/+320
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has proven to be confusing in practice. property/target and properties/targets will be functionally equivilant (the only distinction being singular/plural). In a transition these properties can be used for both 'matching' and explicit animation based on whether a 'to' value is supplied. The documentation, tests, examples and demos have been updated as well.
| * | | QmlView API review. See QmlChanges.txt for details.Martin Jones2010-02-183-227/+229
| |/ /
| * | Fix typo in docsAlan Alpert2010-02-171-1/+1
| | |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-1779-760/+1403
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (47 commits) Add missing NOTIFY signals to various QML item class properties Fix currentIndex after itemsMoved() qmlviewer: build on symbian Revert "Replace QList<>* support with QmlListProperty" Declare QmlXmlListModelRole meta type before any code uses it. Make compile on Symbian (call Q_DECLARE_METATYPE earlier) Conditionally link webkit on wince Revert "Run dos2unix on these files." Expose LayoutItem documentation Fix palette on the N900 Fix QTBUG-8090, improve original patch effectiveness. Replace QList<>* support with QmlListProperty Run dos2unix on these files. Remove standalone QmlDebugger. It is now only available through the Mobility 404 Fix crash in QmlMetaProperty that could occur when using value-type QML binding optimizer crash QML binding optimizer crash Fix crash in QML binding optimizer Don't delete binding directly ...
| | * | Add missing NOTIFY signals to various QML item class propertiesJoona Petrell2010-02-1710-17/+74
| | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| | * | Fix currentIndex after itemsMoved()Martin Jones2010-02-171-8/+46
| | | | | | | | | | | | | | | | | | | | | | | | Ensure fixupPosition() positions properly for StrictlyEnforceRange highlight mode. Update visibleIndex after itemsMoved().
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-173-3/+9
| | |\ \
| | | * | Declare QmlXmlListModelRole meta type before any code uses it.Bea Lam2010-02-171-2/+4
| | | | |
| | | * | Make compile on Symbian (call Q_DECLARE_METATYPE earlier)Bea Lam2010-02-172-1/+5
| | | | |