| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
|
|
|
| |
So we can take advantage of backend optimizations.
|
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
|
|/ |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
* Move scalegrid code into QFxBorderImage
* Update examples
|
| |
|
|
|
|
| |
New base class for QFxImage and QFxBorderImage.
|
| |
|
|
|
|
|
|
| |
* Simplify and improve QFxImage code by using qDrawBorderPixmap
* Add horizontalTileRule and verticalTileRule to .sci files
* Add example in example/declarative/border-image
|
|
|
|
|
| |
Items currently using it are QFxImage, QFxText, QFxLineEdit, QFxTextEdit
and QFxPaintedItem.
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfximage.cpp
|
| | |
|
|/
|
|
| |
as per API review
|
| |
|
|
|
|
| |
Span is from version where introduced (all 4.6) to current QT_VERSION.
|
|
|
|
|
| |
Adjust examples and demos accordingly.
As per QT-558
|
|
|
|
|
| |
propertyInfo was not used by anything, let's just
get rid of it.
|
| |
|
|
|
|
|
| |
Change 6626a9 broke compilation because several files indirectly
depended on a #include that was removed.
|
|\
| |
| |
| |
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfximage.h
|
| | |
|
|/ |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv
Conflicts:
examples/itemviews/frozencolumn/main.cpp
src/declarative/canvas/qsimplecanvas.cpp
src/declarative/canvas/qsimplecanvas_p.h
src/declarative/canvas/qsimplecanvasitem.h
src/declarative/extra/qfxparticles.cpp
src/declarative/fx/fx.pri
src/declarative/fx/qfxblurfilter.h
src/declarative/fx/qfxcontentwrapper.cpp
src/declarative/fx/qfxflickable.cpp
src/declarative/fx/qfxfocuspanel.h
src/declarative/fx/qfxfocusrealm.h
src/declarative/fx/qfxhighlightfilter.cpp
src/declarative/fx/qfxhighlightfilter.h
src/declarative/fx/qfximage.cpp
src/declarative/fx/qfxitem.cpp
src/declarative/fx/qfxitem.h
src/declarative/fx/qfxrect.cpp
src/declarative/fx/qfxreflectionfilter.h
src/declarative/fx/qfxshadowfilter.cpp
src/declarative/fx/qfxshadowfilter.h
src/declarative/fx/qfxtext.cpp
src/declarative/fx/qfxtext.h
src/declarative/fx/qfxtextedit.cpp
src/declarative/opengl/glbasicshaders.h
src/declarative/test/qfxtestengine.cpp
src/declarative/test/qfxtestengine.h
src/declarative/test/qfxtestobjects.cpp
src/declarative/test/qfxtestobjects.h
src/declarative/test/qfxtestview.h
src/declarative/util/qfxglobal.h
src/declarative/util/qfxview.cpp
src/gui/graphicsview/qgraphicsitem_p.h
tools/qmlviewer/qmlviewer.cpp
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/declarative/canvas/qsimplecanvasitem.cpp
src/declarative/canvas/qsimplecanvasitem_p.h
src/declarative/fx/qfxwebview.cpp
|
| | |
|
| | |
|
|/ |
|
|
|
|
| |
(most obvious when item is in a delegate)
|
|
|
|
|
|
|
| |
URLs expressed as strings (possible relative) are resolved relative to
the component in which the string expression is converted to a url value.
All items are converted to use QUrl properties, except SqlConnection, where
the databasename is only a special-case URL (this may need further consideration).
|
|
|
|
|
|
|
| |
Some QFX_RENDER_OPENGL guards were missing and getPen had to be replaced
with d->pen in some places
Reviewed-by: Kai Koehne
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
We will need to optimize the pixmap.toImage calls.
|
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |
| |
| |
| |
| |
| |
| | |
Switch QFxPixmap to use QPixmapCache, not own partial QImage cache.
OpenGL prefers QImage for optimization, but that optimization is only
partially preserved (QFxPixmap deals ONLY with QPixmap now).
Opaque QFxPixmap no longer available.
|
| | |
|
|/
|
|
| |
Caused massive number of warnings with winscw
|