| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
examples/declarative/follow/pong.qml
examples/declarative/listview/dummydata/MyPetsModel.qml
|
| |\
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |\
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |
| | | |
| | | |
| | | | |
Convert to new format, use \snippet.
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | |/
| |/| |
|
|/ / |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton2.qml
examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton3.qml
examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton4.qml
examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton5.qml
examples/declarative/tutorials/contacts/2_Reuse/ContactField1.qml
examples/declarative/tutorials/contacts/2_Reuse/ContactField2.qml
examples/declarative/tutorials/contacts/2_Reuse/ContactField3.qml
examples/declarative/tutorials/contacts/2_Reuse/ContactField4.qml
examples/declarative/tutorials/contacts/2_Reuse/FieldText3.qml
examples/declarative/tutorials/contacts/2_Reuse/FieldText4.qml
examples/declarative/tutorials/contacts/2_Reuse/RemoveButton1.qml
examples/declarative/tutorials/contacts/2_Reuse/RemoveButton2.qml
examples/declarative/tutorials/contacts/2_Reuse/RemoveButton3.qml
examples/declarative/tutorials/contacts/2_Reuse/RemoveButton4.qml
examples/declarative/tutorials/contacts/3_Collections/Button.qml
examples/declarative/tutorials/contacts/3_Collections/ContactField.qml
examples/declarative/tutorials/contacts/3_Collections/FieldText.qml
examples/declarative/tutorials/contacts/3_Collections/RemoveButton.qml
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
demos/declarative/mediabrowser/content/PhonesPathView.qml
demos/declarative/mediabrowser/mediabrowser.qml
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
You can now specify an axis and rotation, rather than using transform.
The tranform behavior has been preserved, however, to allow for cases
where you want a more complex transform when rotating.
|
| |\ \ \
| | |/ /
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |
| | | |
| | | |
| | | | |
They're no longer on by default, as per QWebPage.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Added snippet comments for qdoc, also qmlconv leaves some
errors. ',' where they are not supposed to be,
] and indenting in the wrong places, lack of " around
enum values.
|
|\ \ \ \
| | |/ /
| |/| |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \ \
| | |_|/
| |/| |
| | | | |
kinetic-declarativeui
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The rubberband was not set on the viewport, leading to an offset when
adding margins.
Task-number: 251892
Reviewed-by: Alexis
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| | |\ \ \
| | | |/ /
| | | | |
| | | | |
| | | | | |
Conflicts:
tests/auto/qaction/tst_qaction.cpp
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| | |\ \ \
| | | |/ / |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| | |\ \ \
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/corelib/global/qfeatures.h
src/gui/painting/qtransform.cpp
util/scripts/make_qfeatures_dot_h
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Don't try to draw zero-length lines. Don't draw lines if nodes are
superimposed.
Reviewed-by: Andreas
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Structure hasn't changed, just used qmlconv and started adding
snippet tags
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
kinetic-declarativeui-qfx
Conflicts:
examples/declarative/minehunt/minehunt.qml
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
kinetic-declarativeui-qfx
Conflicts:
examples/declarative/mouseregion/mouse.qml
|
| | | | | | | |
|
| |\ \ \ \ \ \
| | | |_|_|_|/
| | |/| | | |
| | | | | | | |
git://scm.dev.nokia.troll.no/qt/kinetic into kinetic-declarativeui-qfx
|
| | | | | | | |
|
|\ \ \ \ \ \ \
| | |_|_|/ / /
| |/| | | | |
| | | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \ \ \ \ \
| | | |_|/ / /
| | |/| | | |
| | | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |/ / /
| | |/| | | |
|
| | |\ \ \ \
| | | |/ / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfxitem.cpp
|
| | | | | | |
|
| | | | | | |
|
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Axis has been split into Axis, AxisRotation, and AxisTranslation. Basic
docs (in some cases just a stub) have been added for these, Perspective,
and Squish.
Flipable has moved to its own file.
|
| | | | | |
|
| |/ / / |
|
| |\ \ \
| | | | |
| | | | |
| | | | | |
into kinetic-declarativeui
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
A reformat, a couple of extra examples of loading types,
and a start on the contents of chapter 3.
|