| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
|
| |\
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |
|
| | |
| | |
| | |
| | | |
Tags in flickr demo.
|
| | | |
|
|\ \ \
| | |/
| |/|
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |/ |
|
|/ |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
into kinetic-declarativeui
Conflicts:
demos/boxes/scene.cpp
src/opengl/qglpixmapfilter.cpp
src/opengl/qglshaderprogram.cpp
src/opengl/qglshaderprogram.h
|
| |
| |
| |
| | |
Patch originally by Ian Walters.
|
| |
| |
| |
| |
| |
| |
| | |
The shader compilers also report warnings, so it is more appropriate
to call the string a log.
Reviewed-by: trustme
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/rweathers-shaderprograms into shader-api
Conflicts:
src/gui/math3d/math3d.pri
src/gui/math3d/qgenericmatrix.cpp
src/gui/math3d/qgenericmatrix.h
src/gui/math3d/qmatrix4x4.cpp
src/gui/math3d/qmatrix4x4.h
src/gui/math3d/qquaternion.cpp
src/gui/math3d/qquaternion.h
src/gui/math3d/qvector2d.cpp
src/gui/math3d/qvector2d.h
src/gui/math3d/qvector3d.cpp
src/gui/math3d/qvector3d.h
src/gui/math3d/qvector4d.cpp
src/gui/math3d/qvector4d.h
src/opengl/opengl.pro
tests/auto/math3d/math3d.pro
tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
tests/auto/math3d/qquaternion/tst_qquaternion.cpp
tests/auto/math3d/qvectornd/tst_qvectornd.cpp
tests/auto/math3d/shared/math3dincludes.h
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/parser/javascriptgrammar.cpp
src/declarative/qml/parser/javascriptgrammar_p.h
|
| | | | |
|
| | | | |
|
| | | | |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
demos/declarative/mediabrowser/content/PhonesPathView.qml
demos/declarative/mediabrowser/mediabrowser.qml
|
| | | | | |
|
|/ / / /
| | | |
| | | |
| | | | |
ListModel has been ported (under the name ListModel2) to demonstrate. ListModel2 behaves the same as ListModel, except that list "objects" must be called "ListElement" instead of a freeform name.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
|
| |\ \ \
| | |/ /
| | | |
| | | | |
kinetic-declarativeui
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trond Kjernåsen <trond.kjernasen@nokia.com>
|
| |\ \ \
| | |/ /
| | | |
| | | | |
kinetic-declarativeui
|
| | | | |
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | | |
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: Kavindra
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Kavindra
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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.
|
| | | | |
| | | | |
| | | | |
| | | | | |
Nicer order, but not perfect (no global Z)
|
|/ / / / |
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
demos/declarative/webbrowser/WebBrowser.qml
demos/declarative/webbrowser/content/pics/addressbar-filled.png
demos/declarative/webbrowser/content/pics/addressbar.png
demos/declarative/webbrowser/content/pics/back-disabled.png
demos/declarative/webbrowser/content/pics/back.png
demos/declarative/webbrowser/content/pics/footer.png
demos/declarative/webbrowser/content/pics/forward-disabled.png
demos/declarative/webbrowser/content/pics/forward.png
demos/declarative/webbrowser/content/pics/header.png
demos/declarative/webbrowser/content/pics/reload.png
|
| | | | | |
|
|/ / / / |
|
|/ / / |
|