diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-25 10:42:58 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-25 10:42:58 (GMT) |
| commit | 89807f70656b95c1568ef183dd7f28c527fc3eaa (patch) | |
| tree | b5a2775f32ecc7deedc7061c3ffcb75ecfc1f3ea /doc/src/examples/script-qscript.qdoc | |
| parent | c24465d91bd431b4ea178e1459ddd1c385e6d3ce (diff) | |
| parent | fcda1b785bd7d86011f49bfe96cb22b04202933f (diff) | |
| download | Qt-89807f70656b95c1568ef183dd7f28c527fc3eaa.zip Qt-89807f70656b95c1568ef183dd7f28c527fc3eaa.tar.gz Qt-89807f70656b95c1568ef183dd7f28c527fc3eaa.tar.bz2 | |
Merge commit 'fcda1b785bd7d86011f49bfe96cb22b04202933f' into qt-master-from-4.7
Conflicts:
tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
Some tests in tst_qgraphicsgridlayout are commented out because they are failing.
See task QTBUG-14693
Diffstat (limited to 'doc/src/examples/script-qscript.qdoc')
0 files changed, 0 insertions, 0 deletions