summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qicon.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-05-28 02:54:33 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-05-28 02:54:33 (GMT)
commit79a587d813c2df9c45fea7423e5e6c40e2d2b67b (patch)
tree4eba8d7f2a3a199ffce52f77d902331e96764411 /src/gui/image/qicon.cpp
parent5f8312f82ac9ef77c89ef363d9c2e0246b398d20 (diff)
parentf79ea0ecc9ebca896340babd370638a6cf607419 (diff)
downloadQt-79a587d813c2df9c45fea7423e5e6c40e2d2b67b.zip
Qt-79a587d813c2df9c45fea7423e5e6c40e2d2b67b.tar.gz
Qt-79a587d813c2df9c45fea7423e5e6c40e2d2b67b.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/gui/image/qicon.cpp')
0 files changed, 0 insertions, 0 deletions