diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-15 09:05:43 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-15 09:11:31 (GMT) |
| commit | 3ef69b12f6d6905594ef3976b3e16787378dfe6a (patch) | |
| tree | 1105fb45cddf0afca5929041e679e743e36a1772 /src/declarative/qml/qdeclarativesqldatabase_p.h | |
| parent | 1745a0e7799774373ad6252a73d6e8af841db2a1 (diff) | |
| parent | 9358d77fc1de64d2a8a06bfa4095dcde9f9b009b (diff) | |
| download | Qt-3ef69b12f6d6905594ef3976b3e16787378dfe6a.zip Qt-3ef69b12f6d6905594ef3976b3e16787378dfe6a.tar.gz Qt-3ef69b12f6d6905594ef3976b3e16787378dfe6a.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/gui/painting/qpaintengine_raster.cpp
tests/auto/declarative/qdeclarativetext/data/alignments_cb.png
tests/auto/declarative/qdeclarativetext/data/alignments_cc.png
tests/auto/declarative/qdeclarativetext/data/alignments_ct.png
Diffstat (limited to 'src/declarative/qml/qdeclarativesqldatabase_p.h')
0 files changed, 0 insertions, 0 deletions