diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-20 03:07:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-20 03:07:38 (GMT) |
| commit | e12224ab0189cce441f35eba730d843bf6d8f1c8 (patch) | |
| tree | ffab2f02e0db96a55280d8b9bf0ac4774edb7d65 /src/gui/text | |
| parent | 4d93a4eccb462ce3bee75f0c3961901d60bcae02 (diff) | |
| parent | e3af86a892cd7ce70297f0b1e76390cfd18536e2 (diff) | |
| download | Qt-e12224ab0189cce441f35eba730d843bf6d8f1c8.zip Qt-e12224ab0189cce441f35eba730d843bf6d8f1c8.tar.gz Qt-e12224ab0189cce441f35eba730d843bf6d8f1c8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix conflict between QDeclarativeGraphics_DerivedObject declared both in qdeclarativeglobal and tst_creation.cpp
Fix position of synthesized semicolon tokens.
Diffstat (limited to 'src/gui/text')
0 files changed, 0 insertions, 0 deletions