summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2014-08-11 11:58:44 +0200
committerShawn Rutledge <shawn.rutledge@digia.com>2014-08-12 07:27:45 +0200
commit338f9c4f7c42d2a7bcd2c5b37137b3cc7cd9775d (patch)
tree7ca8647ebf9495509ffa6776ad0de79ab60eb54c /src/opengl
parent34198cedbed52d5eb1aa4612b0a162c8a8a9b63a (diff)
qdoc: Distinguish between QML property and attached property
A recent change in qtdeclarative (60ed6a43) added an attached property 'Window' to Item type, with property names identical to the ones already available in Window. This caused QDoc to report warnings for duplicate documentation for QML properties, because there was no distiction between a QML property and an attached property. This change fixes the issue by: - Allowing identical names for \qmlproperty and \qmlattachedproperty - Using distinct URLs/UUIDs/anchor references for them - Marking attached properties with '[attached]' qualifier in 'All Members' page. This doesn't solve the issue of disambiguating between a similarly named QML property and attached property when linking from an external location. However, these can be solved with the help of the \target command. Task-number: QTBUG-40674 Change-Id: Icc74de237366e9897334689fe354ab83e4af0356 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/opengl')
0 files changed, 0 insertions, 0 deletions