Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

1 files changed, 0 insertions, 40 deletions

diff --git a/src/tools/qdoc/doc/config/macros.qdocconf b/src/tools/qdoc/doc/config/macros.qdocconf
deleted file mode 100644
index 2dbc9c1f91..0000000000
--- a/src/tools/qdoc/doc/config/macros.qdocconf
+++ /dev/null
@@ -1,40 +0,0 @@
-macro.aacute.HTML       = "á"
-macro.Aring.HTML        = "Å"
-macro.aring.HTML        = "å"
-macro.Auml.HTML         = "Ä"
-macro.author            = "\\bold{Author:}"
-macro.br.HTML           = "<br />"
-macro.BR.HTML           = "<br />"
-macro.copyright.HTML    = "&copy;"
-macro.eacute.HTML       = "&eacute;"
-macro.gui               = "\\bold"
-macro.hr.HTML           = "<hr />"
-macro.iacute.HTML       = "&iacute;"
-macro.key               = "\\bold"
-macro.menu              = "\\bold"
-macro.note              = "\\bold{Note:}"
-macro.oslash.HTML       = "&oslash;"
-macro.ouml.HTML         = "&ouml;"
-macro.QA                = "\\e{Qt Assistant}"
-macro.QD                = "\\e{Qt Designer}"
-macro.QL                = "\\e{Qt Linguist}"
-macro.QQV               = "\\e{Qt QML Viewer}"
-macro.param             = "\\e"
-macro.raisedaster.HTML  = "<sup>*</sup>"
-macro.rarrow.HTML       = "&rarr;"
-macro.reg.HTML          = "<sup>&reg;</sup>"
-macro.return            = "Returns"
-macro.starslash         = "\\c{*/}"
-macro.begincomment      = "\\c{/*}"
-macro.endcomment        = "\\c{*/}"
-macro.uuml.HTML         = "&uuml;"
-macro.mdash.HTML        = "&mdash;"
-macro.pi.HTML           = "&Pi;"
-macro.beginqdoc.HTML    = "/*!"
-macro.endqdoc.HTML        = "*/"
-
-macro.beginfloatleft.HTML   = "<div style=\"float: left; margin-right: 2em\">"
-macro.beginfloatright.HTML  = "<div style=\"float: right; margin-left: 2em\">"
-macro.endfloat.HTML         = "</div>"
-macro.clearfloat.HTML       = "<br style=\"clear: both\" />"
-macro.emptyspan.HTML        = "<span></span>"