Details
-
Bug
-
Resolution: Done
-
P4: Low
-
5.6.0 Beta
-
None
-
Debian/testing, GNU/Linux, x86_64
-
Iaf8602fc338dadcc0998f33d41ad9fbc827589e2
Description
During make docs:
.../qt5/qtbase/examples/widgets/doc/src/systray.qdoc:28: warning: This page title exists in more than one file: System Tray Icon Example .../qt5/qtbase/examples/widgets/desktop/systray/doc/src/systray.qdoc:28: warning: [It also exists here] .../qt5/qtbase/examples/widgets/doc/src/systray.qdoc:28: error: HTML file already exists; overwriting .../qt5/qtbase/doc/qtwidgets/qtwidgets-desktop-systray-example.html qdoc: error: HTML file already exists; overwriting .../qt5/qtbase/doc/qtwidgets/qtwidgets-desktop-systray-window-cpp.html qdoc: error: HTML file already exists; overwriting .../qt5/qtbase/doc/qtwidgets/qtwidgets-desktop-systray-window-h.html qdoc: error: HTML file already exists; overwriting .../qt5/qtbase/doc/qtwidgets/qtwidgets-desktop-systray-main-cpp.html qdoc: error: HTML file already exists; overwriting .../qt5/qtbase/doc/qtwidgets/qtwidgets-desktop-systray-systray-pro.html qdoc: error: HTML file already exists; overwriting .../qt5/qtbase/doc/qtwidgets/qtwidgets-desktop-systray-systray-qrc.html make[5]: Leaving directory '.../qt5/qtbase/src/widgets'
and, sure enough, a find | xargs grep reveals
qt5/qtbase/examples/widgets/doc/src/systray.qdoc:30: \title System Tray Icon Example qt5/qtbase/examples/widgets/desktop/systray/doc/src/systray.qdoc:30: \title System Tray Icon Example
The diff between these two files is small - I suspect the file got moved and we somehow managed to not delete one of them, or someone rebased a change past the move and inadvertently restored the deleted version of the file with some fixes that should be ported to the moved version.
(Assign to me if you want me to do git magic to uncover the detailed history.)
Attachments
For Gerrit Dashboard: QTBUG-50287 | ||||||
---|---|---|---|---|---|---|
# | Subject | Branch | Project | Status | CR | V |
145132,3 | Doc: removed double occurrence of systray.qdoc | 5.6 | qt/qtbase | Status: MERGED | +2 | 0 |