| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Change-Id: I1cfae5fb57025372789391632bac4cb97b8450dc
Reviewed-on: http://codereview.qt.nokia.com/1684
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
- add Image.Pad as a fillMode
- add horizontal and vertical alignment properties
Task-number: QTBUG-18291
Change-Id: Iaaf3b2d02c47ad01d2c8b49d146f1a9401b2558d
Reviewed-on: http://codereview.qt.nokia.com/1468
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
|
|
|
|
|
|
|
|
| |
Replace old license header with correct one.
Change-Id: I492ddaaa0227b2c8faf11bdcd6e12e7231a54a10
Reviewed-on: http://codereview.qt.nokia.com/1312
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
|
| |
|
|
|
|
|
|
|
|
| |
This is a partial fix only. We will eventually need to get
proper sharing of resources across multiple GL contexts, but this
fixes the autotest and will work for most usecases.
The task QTBUG-19455 has been created to solve it properly.
|
|
|
|
| |
Change-Id: Id94e5557e8ebbed4494fb342b87b8b595e01b38b
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
This reverts commit ffb6fe57ee0ece18b6778889f7602811ab4ca822.
Conflicts:
src/declarative/scenegraph/qsgdefaultimagenode.cpp
|
|
Branched from the monolithic repo, Qt qtquick2 branch, at commit
a4a585d2ee907746682846ae6e8a48e19deef469
|