diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2014-04-28 13:04:56 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-28 19:49:12 +0200 |
| commit | 2222fdf3304e921b7441932827da72a46418b649 (patch) | |
| tree | cc7ee8f4e0e45d01cb23690d4995758c9336c084 | |
| parent | 143eab87111f4ac0dd659b0a0cc217274603a2bb (diff) | |
Doc: Remove Qt Core documentation dependency to Qt QML
When generating documentation, the Qt namespace declared in Qt Core
collides with the Qt global object declared in Qt QML. This caused
the C++ Qt namespace documentation to go missing.
This change works around the issue by removing the dependency
between Qt Core and Qt QML.
Task-number: QTBUG-38630
Change-Id: Ifd250a19c476bc30e2a2ed561573c8b6b3b2dba5
Reviewed-by: Martin Smith <martin.smith@digia.com>
| -rw-r--r-- | src/corelib/doc/qtcore.qdocconf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf index c8eb15a7f7..c9c8f1da54 100644 --- a/src/corelib/doc/qtcore.qdocconf +++ b/src/corelib/doc/qtcore.qdocconf @@ -26,7 +26,8 @@ qhp.QtCore.subprojects.classes.sortPages = true tagfile = ../../../doc/qtcore/qtcore.tags -depends += activeqt qtdbus qtgui qtwidgets qtnetwork qtdoc qtmacextras qtqml qtquick qtlinguist qtdesigner qtconcurrent qtxml qmake +depends += activeqt qtdbus qtgui qtwidgets qtnetwork qtdoc qtmacextras qtquick qtlinguist qtdesigner qtconcurrent qtxml qmake +# depends += qtqml # Qt namespace collides with QtQml::Qt, see QTBUG-38630 headerdirs += .. |