summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qlineedit_p.cpp
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2015-08-03 13:32:06 +0200
committerTopi Reiniƶ <topi.reinio@digia.com>2015-08-04 14:15:39 +0000
commit1e39c712bd726e9ef426ecc316edad58d134decf (patch)
treec9570b451136c43b889c2f0bbf78caa4912751fc /src/widgets/widgets/qlineedit_p.cpp
parentabbf82bdfcf0a233553cceb73d4cff56b6cd273d (diff)
qdoc: Do not merge QML module nodes with different major versions
As we may have multiple versions of a QML module present in the doc build, the logic QDoc uses for merging collection nodes from different trees needs to be revised a bit. After this change, the collection nodes for identically-named QML and JS modules are merged only if the major version number matches. This prevents the situation where QML types for both versions are listed in QML module pages. Change-Id: I76b056a2073744347b160b25ed5bb043279f2b8a Task-number: QTBUG-47536 Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/widgets/widgets/qlineedit_p.cpp')
0 files changed, 0 insertions, 0 deletions