| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
QDeclarativeXXX.
|
| |
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
src/declarative/qml/qml.h
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/declarative/advtutorial1.qdoc
src/declarative/qml/qmlmoduleplugin.cpp
src/declarative/util/qmlxmllistmodel.cpp
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
doc/src/declarative/advtutorial1.qdoc
doc/src/declarative/advtutorial2.qdoc
doc/src/declarative/advtutorial3.qdoc
doc/src/declarative/advtutorial4.qdoc
doc/src/declarative/tutorial1.qdoc
doc/src/declarative/tutorial2.qdoc
doc/src/declarative/tutorial3.qdoc
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
doc/src/declarative/advtutorial1.qdoc
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Trust Me
|
|\ \ \ \ \ \
| |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/declarative/util/qmlanimation.cpp
src/declarative/util/qmlxmllistmodel.cpp
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Now it's possible to use easing curve types directly in qml as value
types, {easing.type: "OutBounce"; easing.amplitude: 3}, instead of the
former ugly string format, like "easeOutBounce(amplitude:3.0)".
Reviewed-by: akennedy
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QmlBinding exposes way too many implementation details to be confident
about making it public right now.
|
| |\ \ \ \ \ |
|
| | | | | | | |
|
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | | |
Task-number: QT-2777
|
| |/ / / /
|/| | | |
| | | | |
| | | | | |
Task-number: QT-2798
|
|/ / / / |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Mention that the same game tutorial is now slightly different to the
demo version.
|
| | | | |
|
|\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml:
Replace QmlList* and QList* support with a single QmlListProperty type
Rename MouseRegion -> MouseArea
Update QmlChanges with animation API changes.
Document the default velocity of EaseFollow
Remove use of unexprted private classes.
Fix compile error on Solaris
Increase durations when testing Behaviors.
Add cached path rounded rect painting benchmark.
Remove use of direct event posting. Use QTest::keyClick() for keys.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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).
|
| | |/
| |/| |
|
|/ / |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| | |
|
| |\ |
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | |/
| |/| |
|
| | | |
|
| |/ |
|
| | |
|
| | |
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
|/ / |
|
| | |
|
| | |
|
| | |
|
|/
|
|
| |
Also made it slightly more verbose.
|
|
|
|
| |
Task-number:QTBUG-6034
|
|
|
|
| |
Task-number: QTBUG-6396
|
| |
|
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |
| |
| |
| | |
Document automatic signal handlers and QmlViewer.Screen.
|
| |
| |
| |
| |
| | |
The changes to qdoc3 to support this will be in the 4.7
master branch.
|
|/ |
|
|
|
|
| |
Task-number: QTBUG-7720
|
|
|
|
|
|
| |
examples accordingly.
Task-number: QT-2786
|