| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: Kent Hansen
|
| |
|
|
|
|
| |
Reviewed-by: TrustMe
|
|
|
|
| |
Reviewed-by: Frans Englich
|
|
|
|
| |
Reviewed-by: Harald Fernengel
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The idea of having separate rotationX/Y/Z, shearX/Y, etc.
methods in QGraphicsItem turned out to be not giving us
the flexibility we need and wanted.
The new code now implements a different scheme, where we
keep simple rotate (around z-axis), scale and
transformOriginPoint methods, but remove the other ones.
Instead we now have an additional list of QGraphicsTransform
object. QGraphicsTransform is an abstract class that inherits
QObject. Several specializations are provided and can be
used to transform (and through property bindings animate)
the item.
Reviewed-By: Andreas
|
|
|
|
| |
too "advanced".
|
|
|
|
| |
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
We need this to support the behavior in Gtk+ where, when
Qt::ToolButtonTextBesideIcon is used, only text labels
for important actions are shown. It will also enable us to
prioritize actions in the future when for instance collapsing
a toolbar.
Task-number: 258290
Reviewed-by: thierry
|
|
|
|
|
|
|
|
|
|
|
|
| |
KDE and GNOME has the concept of a default tool button style that
can be set system-wide. Qt currently allways default to IconOnly.
I have added an optional Qt::ToolButtonSystemDefault value so you
can opt-in to respect the system setting. We did not change the
default because a lot of apps will look odd when for instance
text is beside icons and the descriptive text is too long.
Task-number: 237864
Reviewed-by: ogoffart
|
|
|
|
|
|
|
|
| |
On Windows, the FileDescription part of the version information is used
as a caption for the grouped taskbar button.
Task-number: 253065
Reviewed-by: Prasanth Ullattil
|
|
|
|
|
|
|
| |
for roman numbering of lists as supported by HTML/ODF
Reviewed-by: Olivier Goffart
Merge-request: 681
|
|\ |
|
| |
| |
| |
| |
| |
| | |
Place the databases into the normal data location.
Reviewed-by: Ariya
|
|\ \
| |/ |
|
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| |
| |
| |
| |
| | |
Task-number: QT-80
Reviewed-by: Ian Walters
|
|\ \
| |/
| |
| |
| | |
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
|
| | | | |
|
|\ \ \ \
| | |/ /
| |/| | |
|
| |\ \ \
| | | |/
| | |/| |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Samuel
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobject_p.h
src/network/access/qhttpnetworkconnection.cpp
|
| | |/
| | |
| | |
| | | |
Reviewed-by: Lincoln Ramsay
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QStyleOptionGraphicsItem extends QStyleOption with three values:
1) matrix, 2) levelOfDetail, 3) exposedRect, and they all
involve expensive QTranform operations when calculated. We
pass style option(s) to drawItems() and paint(), but the
extended values are usually not in use. We can therefore gain
quite some nice speedup by making them opt-in with the
QGraphicsItem::ItemUsesExtendedStyleOption flag.
Additionally, QStyleOptionGraphicsItem::levelOfDetail has been
obsoleted, and a new function QStyleOptionGraphicsItem::
levelOfDetailFromTransform(const QTransform &) has been added.
Me and Andreas don't consider this change to be too controversial
even though it changes the behavior.
Auto tests still pass.
Reviewed-by: Andreas
|
|\ \ \
| |/ / |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Kavindra Palaraja
|
| | | |
|
| | |
| | |
| | |
| | | |
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
|
| | | |
|