diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-29 23:01:55 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-29 23:01:55 +1000 |
| commit | e6f5fc28e82732dd214d87bd6c6a8a2efbf89f14 (patch) | |
| tree | 2832e2565aed90653ded8c3d324974b16aab338c /tests/manual | |
| parent | 0a502ef47f1c6bf06c28dd966b63e3963cd2f630 (diff) | |
| parent | 013df7417f1496f476c23251a90aa454687d2f74 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Set execution bits for more scripts.
Set execution bits for .test files.
Fix more permissions (no execute bit).
Fix permission (no execute bit).
QGraphicsLayoutItem - bound constraint the minimum and maximum size
Notify X11 of its resizable state through MWM Hints.
Diffstat (limited to 'tests/manual')
| -rw-r--r--[-rwxr-xr-x] | tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/green_image_transparent.png | bin | 1153 -> 1153 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image.png | bin | 219220 -> 219220 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_opaque.png | bin | 293803 -> 293803 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_small.png | bin | 40220 -> 40220 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/wallpaper.jpg | bin | 337569 -> 337569 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg index 3005133b8e..3005133b8e 100755..100644 --- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg +++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/green_image_transparent.png b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/green_image_transparent.png Binary files differindex f3024f7eeb..f3024f7eeb 100755..100644 --- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/green_image_transparent.png +++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/green_image_transparent.png diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image.png b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image.png Binary files differindex 144c02d548..144c02d548 100755..100644 --- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image.png +++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image.png diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_opaque.png b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_opaque.png Binary files differindex c73d38927e..c73d38927e 100755..100644 --- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_opaque.png +++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_opaque.png diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_small.png b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_small.png Binary files differindex b2267737fd..b2267737fd 100755..100644 --- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_small.png +++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_small.png diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/wallpaper.jpg b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/wallpaper.jpg Binary files differindex 5bc7b58550..5bc7b58550 100755..100644 --- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/wallpaper.jpg +++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/wallpaper.jpg |
