diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-06 21:47:38 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-06 21:47:38 (GMT) |
commit | 98ea9a7915bf40d49c9682d495726a42b8345c04 (patch) | |
tree | 8b8879cea103c26956067adf2e66dfaf7edeea0c /tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg | |
parent | 3b6324bf11f31d09424297c5e789e5ce4f0afbb7 (diff) | |
parent | c59567a7a2b45ecde7836e09b1a5cd020b2fad4a (diff) | |
download | Qt-98ea9a7915bf40d49c9682d495726a42b8345c04.zip Qt-98ea9a7915bf40d49c9682d495726a42b8345c04.tar.gz Qt-98ea9a7915bf40d49c9682d495726a42b8345c04.tar.bz2 |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Fix declarative examples and demos issue on Windows
qmlplugindump: Fix missing flush for objects that don't fit a line.
qmlplugindump: Avoid reporting types as attaching to themselves.
Fix QtDemo declarative examples
Correct image paths for dynamicscene
Fix stack overwrite in QDBusDemarshaller
Qt Linguist: Fix crashes
fixed error generating wrong introspection string in header output file
Backport SMP safe initialisation of QNetworkConfigurationManager
Remove more "unused variable" warnings
QTreeView: fix crash when starting a drag with hidden columns.
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/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg')
-rw-r--r--[-rwxr-xr-x] | tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg | 0 |
1 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 3005133..3005133 100755..100644 --- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg +++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg |