summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativecomponent.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-10 01:50:34 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-10 01:50:34 (GMT)
commit8d312c3c91931d60ef3d4585cb729db21f3489c2 (patch)
tree642c70e79da4173b74b4273049461e25078b384c /src/declarative/qml/qdeclarativecomponent.cpp
parent899c6dfcbc0d5ffd8da5676b3496ae31d2515235 (diff)
parent27b5da4ff5a762df0ab3e98ecde9dac4aa589178 (diff)
downloadQt-8d312c3c91931d60ef3d4585cb729db21f3489c2.zip
Qt-8d312c3c91931d60ef3d4585cb729db21f3489c2.tar.gz
Qt-8d312c3c91931d60ef3d4585cb729db21f3489c2.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: Associate qmlInfo() documentation with QDeclarativeEngine
Diffstat (limited to 'src/declarative/qml/qdeclarativecomponent.cpp')
0 files changed, 0 insertions, 0 deletions