summaryrefslogtreecommitdiffstats
path: root/LICENSE.FDL
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2010-07-15 18:26:23 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-07-15 18:30:44 (GMT)
commit63d0b54df365380107cea7017c7893c7d04df13e (patch)
tree0919c82a21e0b0056f0eb180ce139c8ab99eb633 /LICENSE.FDL
parent4e0d2169790f91348c59432f651878e604923dae (diff)
downloadQt-63d0b54df365380107cea7017c7893c7d04df13e.zip
Qt-63d0b54df365380107cea7017c7893c7d04df13e.tar.gz
Qt-63d0b54df365380107cea7017c7893c7d04df13e.tar.bz2
Fix compilation after merge
viewport has been renamed contentItem in 4.7 (commit 9d6ccfea89ae99b747f70ece71185868f189d0f9) (the code in master was added in commit 8c08c737837389f5ff2641219eb901ad217d3f24)
Diffstat (limited to 'LICENSE.FDL')
0 files changed, 0 insertions, 0 deletions