| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: Joerg
|
| |
|
| |
|
| |
|
|
|
|
| |
sized skin (like emulator).
|
| |
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
tools/qmlviewer/qmlviewer.h
|
| |
| |
| |
| |
| | |
Add a colorGroup property and remove palette properties from the
root context.
|
|/ |
|
|
|
|
|
| |
While recording video, ignore realtime rate and deliver perfect
per-frame animation.
|
| |
|
|
|
|
| |
Use QWidget::render instead of QPixmap::grabWidget
|
| |
|
| |
|
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
|
|/ |
|
|\
| |
| |
| |
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv
Conflicts:
src/declarative/fx/fx.pri
|
| |\
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
| | |
| | |
| | | |
Handle palette changes in QmlPalette.
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv
Conflicts:
src/declarative/canvas/qsimplecanvas.cpp
src/declarative/canvas/qsimplecanvasdebugplugin.cpp
src/declarative/canvas/qsimplecanvasdebugplugin_p.h
src/declarative/fx/qfxpainteditem.cpp
src/declarative/util/qfxview.cpp
tools/qmlviewer/qmlviewer.h
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/parser/qmljsparser.cpp
|
| | | |
|
| | | |
|
| | | |
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlscriptparser.cpp
src/declarative/qml/qmlscriptparser_p.h
Compiles, but probably next needs a revert/change of module stuff,
since that work seems to have been duplicated.
|
| | |
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| | |
|
| | |
|
|/ |
|
|
|
|
|
| |
The view is only resized; it's up to the QML to decide what that means
(eg. scaling, cropping, etc.)
|
|
|
|
| |
See also 1312c0ca987b008d43558ff4cfa69b8dfd11616e
|
| |
|
|
|
|
|
| |
When creating a file dialog, you need to show its parent prior to
invoking that dialog.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
It is basically impossible to make QMainWindow size the contents to the
exact size wanted. Correct sizing is particularly important for
visual test recording.
|
|
|
|
|
|
|
|
|
|
| |
Can now:
DialLibrary.Dial { ... }
without any import statement.
Can also run qmlviewer with -L DialLibrary then use Dial { ... }.
The exact way this works will almost definitely change to ensure predictable
behaviour under future type additions to scopes.
|
| |
|
| |
|
| |
|
|
|
|
| |
(now that deviceskins includes them as qrc, we may as well use them)
|