summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-10 04:15:58 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-10 04:15:58 (GMT)
commit50bb35a5ca48816f7563d1055071b4caa7791056 (patch)
tree07767ff9365d4f44291bab87ed9f5c8471d13040 /src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h
parentd28ca0cfc3d26b5cd4c48ce027063a27347e1b12 (diff)
parentd7e42d7c5b0eb6513526d0c21025939a467e8d68 (diff)
downloadQt-50bb35a5ca48816f7563d1055071b4caa7791056.zip
Qt-50bb35a5ca48816f7563d1055071b4caa7791056.tar.gz
Qt-50bb35a5ca48816f7563d1055071b4caa7791056.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: Update modules-related tests and docs CLeanup registers after AddString
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h')
0 files changed, 0 insertions, 0 deletions