| 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
|
| | | |
|
| |/
|/|
| |
| |
| |
| |
| |
| | |
-Uses a more familar rule set
-Default theme swapped
-Sizing altered. Now the tiles are 40x40 so as to be able to be pretty
and have shiny animations, board size is set by what can fit in the
game canvas.
|
| |
| |
| |
| |
| | |
This demo primarily demonstrates use of JS and dynamic creation with
QML, by creating a functional and animated game entirely with QML & JS
|
|\ \
| |/
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |
| |
| |
| | |
Also changed syntax for emitting a signal to be consistent with normal QtScript.
|
|\ \
| |/
| |
| |
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
demos/declarative/flickr/content/ImageDetails.qml
|
| | |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
examples/declarative/states/states.qml
examples/declarative/states/transitions.qml
examples/declarative/tutorials/helloworld/t3/tutorial3.qml
src/declarative/util/qmlanimation.cpp
|
| | | |
|
| | | |
|
| |/
| |
| |
| | |
Also removed all uses of SetProperty
|
|/ |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| | |
kinetic-declarativeui
Conflicts:
configure.exe
tools/qdoc3/htmlgenerator.cpp
|
| |\ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/boxes/glshaders.cpp
src/gui/graphicsview/qgraphicsitem.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tools/linguist/shared/cpp.cpp
translations/linguist_ja.qm
translations/qt_ru.qm
|
| | |
| | |
| | |
| | |
| | |
| | | |
You can't static_cast from a signed to an unsigned type and vice versa.
Reviewed-by: Kim
|
| | |
| | |
| | |
| | | |
Reviewed-by: jbache
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Basically we need to revert more of Oliviers change. The reason
is that we just cannot run the demo on mac without timer based
updates (as opposed to graphics view itself tries to figure out
when to update). The reason is that the demo uses QItemAnimations
extensivelly, which again uses QTimelines, wich again uses
separate timers. And on mac, because of coalesced updated, each
item animation will result in an individual redrawing of the scene.
Task-number: 255751
Reviewed-by: Olivier
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The QT_BUILD_TREE variable only works in the source or build dir, but fails
in the demo which *install* the sources that should be buildable too.
Reviewed-by: Marius Storm-Olsen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Change 259b65c2f5d736dd7f6d81b6390f54464dd5f183
prevents the animation from running on Windows. This is a partial
revert that still preserves most of the performance fixes.
Reviewed-by: ogoffart
|
| | | |
|
| | |
| | |
| | |
| | | |
after installing
|
| | |
| | |
| | |
| | |
| | |
| | | |
GLchar is defined to be unsigned on Solaris for some reason.
Reviewed-by: Tom
|
| | |
| | |
| | |
| | |
| | | |
Behaviour was renamed Behavior. Was Australian spelling, now
US spelling.
|
|\ \ \
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | |
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/kernel/qabstractitemmodel.cpp
src/corelib/kernel/qobject.cpp
tools/qdoc3/htmlgenerator.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
No point in caching a background that is already a pixmap. When
maximizing the window this pixmap gets huge, and it doesn't help
performance either.
Reviewed-by: Trond
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
kinetic-declarativeui
Conflicts:
configure.exe
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/tree.cpp
|
| | |\ \
| | | |/ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The tick timer is always active, even if the moving gree Qt logo is not visible.
But the code that is supposed to pause it when the app loose the focus doesn't works if
the moving Qt logo is not visible.
Also the call to syncX makes Xorg takes lot of cpu.
It doesn't fix the fact that the timer is still running while the green logo is not visible,
but at least doesn't take the cpu anymore if qtdemo loose the focus.
Task-number: 255020
Reviewed-by: Richard Moe Gustavsen
|
| |\ \ \
| | | | |
| | | | |
| | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |\ \ \
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
configure.exe
src/gui/math3d/qmatrix4x4.cpp
src/gui/math3d/qmatrix4x4.h
tools/qdoc3/htmlgenerator.cpp
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QT-80
Reviewed-by: Ian Walters
|
| |/ / / |
|
| |\ \ \
| | | | |
| | | | |
| | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | | |
|
| | | | | |
|
| |\ \ \ \
| | |/ / /
| |/| / /
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
kinetic-declarativeui
Conflicts:
mkspecs/features/qt.prf
src/corelib/animation/qanimationgroup.cpp
src/corelib/animation/qparallelanimationgroup.cpp
src/corelib/animation/qpauseanimation.cpp
src/corelib/animation/qpropertyanimation.cpp
src/corelib/animation/qsequentialanimationgroup.cpp
src/corelib/kernel/kernel.pri
src/corelib/kernel/qvariant_p.h
src/corelib/tools/qeasingcurve.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/opengl/opengl.pro
src/opengl/qgl_x11egl.cpp
tests/auto/auto.pro
|
| | |\ \
| | | |/
| | | |
| | | |
| | | | |
Conflicts:
tests/auto/qtreeview/tst_qtreeview.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
That was a bug in the exemple.
Reviewed-by: Kavindra Palaraja
|
| | |\ \ |
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
kinetic-animations
Conflicts:
src/corelib/kernel/kernel.pri
src/corelib/kernel/qvariant_p.h
src/corelib/tools/tools.pri
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicswidget.h
src/gui/gui.pro
|