| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Author: Erik Verbruggen
(cherry picked from commit b67d5d90a306534a1ea2fcb333981c6b1126105c)
|
|
|
|
|
| |
This was causing crashes in the qmldesigner.
(cherry picked from commit 3b8cad8be96d7791e8ca8305609d1155ec093b80)
|
|
|
|
|
|
|
| |
Make source a designable property, add missing declarations for
enumerations.
Reviewed-by: akennedy <qt-info@nokia.com>
(cherry picked from commit 0998fc069512d0ae2853929489b80f35e0d9d4ae)
|
|
|
|
|
|
|
| |
do not include headers of disabled modules
Reviewed-by: Paul Olav Tvete
(cherry picked from commit 4795583b42577259499b34da07077f501e45ce42)
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/declarative/graphicsitems/qdeclarativeevents.cpp
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/qml/qdeclarativescript.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativebehavior.cpp
src/declarative/util/qdeclarativeeasefollow.cpp
src/declarative/util/qdeclarativefontloader.cpp
src/declarative/util/qdeclarativelistmodel.cpp
src/declarative/util/qdeclarativespringfollow.cpp
src/declarative/util/qdeclarativestategroup.cpp
src/declarative/util/qdeclarativesystempalette.cpp
src/declarative/util/qdeclarativetimer.cpp
src/declarative/util/qmlstateoperations.cpp
src/multimedia/qml/qdeclarativeaudio.cpp
src/multimedia/qml/qdeclarativevideo.cpp
|
| |\ |
|
| | |
| | |
| | |
| | | |
This reverts commit b5700759da7bccf0ccd6e20b1727950532894ad2.
|
| | |\ |
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QT-2822
|
| | | | |
|
| |\ \ \
| | | |/
| | |/| |
|
| | |/ |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |/ |
|
| | |
|
| |\ |
|
| | | |
|
| | |\ |
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/declarative/qml/qdeclarativeproperty.cpp
|
| | |\ \ \ |
|
| | |\ \ \ \ |
|
| | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/declarative/qml/qdeclarativemetaproperty.cpp
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This follows on from a2a8cea2835ef24104fe784b6ce0f508cc5637c0 to make
it work for PropertyChanges and QDeclarativeMetaProperty as well.
Task-number: QT-2783
|
| | |_|_|_|_|/
| |/| | | | |
| | | | | | |
| | | | | | | |
A viewport is the thing you look through, not what you look at.
|
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
ParentAnimation will replace ParentAction. It provides two advantages:
* It will animate correctly when reversed.
* It allows reparenting via another item, which is useful in
the presence of clips, for example.
|
| | | | | | |
|
| | | | | | |
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeparticles.cpp
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Now, you have to reimplement registerTypes(uri) to expose native
QML types, and initializeEngine(engine,uri) to add instances to
the QML engine's root context.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
There's nothing meta about our properties.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Now it is possible to define bindings using the `on' context keyword.
For example, you can write
Behavior on opacity {
NumberAnimation { duration: 500 }
}
instead of
opacity: Behavior {
NumberAnimation { duration: 500 }
}
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QT-1817
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
transform.
Fixes pathview <-> details transition in flickr demo.
|
| | | | | | | |
|
| | | |_|_|/
| | |/| | | |
|
| | | | | | |
|
| | |\ \ \ \ |
|
| | | | |_|/
| | | |/| |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Avoid changing the value of the property, while the animation is stopped.
This was triggered while changing the duration of the animation, while
it was stopped.
Task-number: QTBUG-8507
Reviewed-by: Michael Brasser
|
| | | | | | |
|
| | |\ \ \ \
| | | |/ / / |
|
| | | | |/
| | | |/| |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We now prohibit QDeclarativeMetaProperty ever getting into a state where
it is pointing to the attached object itself.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The behavior of createProperty() (to resolve dot properties) is now the
behavior of the constructors.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We don't want to allow manipulation of bindings and signal properties through
the public API. Equivalents of the public functions now exist in
QDeclarativeMetaPropertyPrivate for internal use.
|