summaryrefslogtreecommitdiffstats
path: root/qmake/property.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-09-02 04:14:33 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-09-02 04:14:33 (GMT)
commitcf7d5f1da51d3664dcaf5eb06d7c82be4a127f13 (patch)
tree3daca0ab5759fa170c6fedf00a11c67923341383 /qmake/property.h
parentb7c57a2e26a325a1876bd7c68d9f187da084d569 (diff)
parent941f886eab8714a02003816f347103697437e7db (diff)
downloadQt-cf7d5f1da51d3664dcaf5eb06d7c82be4a127f13.zip
Qt-cf7d5f1da51d3664dcaf5eb06d7c82be4a127f13.tar.gz
Qt-cf7d5f1da51d3664dcaf5eb06d7c82be4a127f13.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: Revert readonly BorderImage::sourceSize change
Diffstat (limited to 'qmake/property.h')
0 files changed, 0 insertions, 0 deletions