summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2011-08-23 20:45:26 (GMT)
committerSergio Ahumada <sergio.ahumada@nokia.com>2011-08-23 20:45:26 (GMT)
commitd54407928be05781ede2358baba2f2f91749cc80 (patch)
tree0a7f387c9542f750236783eb39b9cd26c9693328 /src/declarative/graphicsitems/qdeclarativeborderimage.cpp
parent4e40c388aef3cb16a1492764c37ae8ba929e8aef (diff)
parent6c0c437962a2638cca162277b14a30dae4fed57b (diff)
downloadQt-d54407928be05781ede2358baba2f2f91749cc80.zip
Qt-d54407928be05781ede2358baba2f2f91749cc80.tar.gz
Qt-d54407928be05781ede2358baba2f2f91749cc80.tar.bz2
Merge branch 4.7 into qt-4.8-from-4.7
Conflicts: doc/src/index.qdoc
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeborderimage.cpp')
0 files changed, 0 insertions, 0 deletions