When a QML type is marked \qmlabstract, the documentation for
its properties is included on the reference page for each QML
type that inherits the abstract QML type. This means that when
using the link command to link to one of these properties in
HTML, qdoc must first obtain the correct file name. It was not
getting the correct file name, when the link command appeared
in documentation for a QML type that didn't inherit the QML
type marked abstract. This update corrects that bug.

Change-Id: I91ccb34e43618b7bbc1909026cbdf0c1b719df87
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

QDOC2_COMPAT is no longer meaningful.

Change-Id: I7ba96cef2002ffeaccb333d4938f9f415569850a
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

A class node must have pointers to the class nodes of its base classes, but these
pointers might not exist when qdoc creates the class node for the class. They might
not exist until all the index files and include files have been parsewd. qdoc was
trying to resolve the base classes too early. This update lets qdoc wait until it
is known that everything has been built before attempting to resolve inheritance.

This update also delays finding the pointer to the function node for the overridden
function for a function marked "override" until the pointer is needed. Instead of
storing the pointer to the node, the qualification path to the function is stored
as a string, and the string is used to look up the overridden function when it is
needed, which is only when the \reimp command is processed during output.

The function that resolves the pointer to the overridden function was moved to the
function node class, where it makes more sense. The way a few qdoc warnings are
reported was also changed.

Change-Id: Ia54642d11242386ae75139065f481e5d30f79fb5
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

Silence warning by gcc 7.2.

Change-Id: Ia734d7161fccb2f700bd955dc52c904e1e31987e
Reviewed-by: Martin Smith <martin.smith@qt.io>

Extract a helper function to resolve snippet files
and use it in the WebXML generator to output the
resolved snippet path. This can be used by PySide2
to fall back to a C++ snippet in case a matching
Python snippet is not present.

Task-number: PYSIDE-363
Change-Id: I182ae660227e97edf43e6dac906aeff9a5ae23f9
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

 Conflicts:
	.qmake.conf

Change-Id: I83e2382427eb4a8ee0d52d3c4f379242ef80e09e

From Qt 5.11, QDoc requires clang from LLVM 3.9 or later.
This new dependency must be listed in the Qt documentation.
This update adds a short page to the QDoc User Guide that
provides basic (preliminary) information for users intending
to build and/or run QDoc.

Change-Id: I7e86d6515d05b4d993fb91889e6f060c6aa0706e
Task-number: QTBUG-65762
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

Task-number: PYSIDE-363
Change-Id: If076c9a77a5a11c05035f6fc30e6d68e60a35045
Reviewed-by: Martin Smith <martin.smith@qt.io>

Change-Id: I36131109dd16e570dbbdc5ce875d95e886e277ae

Change-Id: I5bf60853e60f7e6329747e65185a1701893052a0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>

The Qt UI Tools library is built statically by default. We should
therefore release it under a more liberal license than BSD. This follows
the example of the qtmain library, which is also available under BSD.

[ChangeLog][Licensing] The Qt UI Tools library got relicensed to
commercial + BSD.

Change-Id: I0de0f5213305d148dcc64ab02177b92e99e3eb43
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

qmake passes system paths via -isystem, which wreaks havoc.

Fix copied from QtCreator's build system.
See also https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129



Task-number: QTBUG-65920
Change-Id: Ifae6aea6ccb1a15282657377880a8f5a37ea42a0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>

Change-Id: I1b23f25c7add7a9bcb97c91696bea58a8f9c3b42

The ClangCodeParser was not setting the override flag in function nodes
for member functions declared with the override attribute. This update
fixes that bug.

Change-Id: Ib67c106982f83164a862b2181c77798733fc3864
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

Change-Id: I4518cebaab27ef557e61b14d6a336427c242610a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

Change-Id: I5ab90b96d7624da66e7b4f0ce93ddb679c31d8c6

Task-number: QTBUG-65810
Change-Id: I3d9befbc56e1c7a63c383e872977e10d1eaa3734
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

We have the case where multiple different topic commands can
appear in a qdoc comment in a .cpp file, when C++ is being
documented as QML. Specifically, a \qmlpropertygroup command
can be used with multiple \qmlproperty commands. The clang
code parser was reporting this as an error, even though clang
would never see these commaqndes because they are parsed by
the old qdoc command parser. The hasTooManyTopics() function
was changed to allow this case. It fixes many qdoc warnings
in QtDeclarative.

Change-Id: Iaea9a4b9c531f022544749819f65a48111ad0cc1
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

When clang parsing errors were detected in the prepare phase, they were
being printed without the preceding qdoc warning that shows where they
occur in the source file. The qdoc warning was not printed because qdoc
was running in the prepare phase, but the clang errors were printed, and
that was wrong. This update ensures that the clang parsing errors are only
printed in the generate phase (or in singleexec mode).

Change-Id: I011fa06626a5e9930fde329113d2bbac8830473b
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

Change-Id: I31c31abedd3de4399b739dd69ec4032c50bcc039

 Conflicts:
	src/qtattributionsscanner/main.cpp

Change-Id: Ic509d457547ec64122b17511563de5ea3e1b1b44

Change-Id: If42398de185eb820d9880173b4e67a0b203e2f60
Reviewed-by: Martin Smith <martin.smith@qt.io>

Use QDesktopWidget::availableGeometry(QWidget *) instead
of QDesktopWidget::availableGeometry(int), fixing:

shared\previewmanager.cpp:784:102: warning: 'const QRect QDesktopWidget::availableGeometry(int) const' is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations]
             const QRect availGeometry = desktop->availableGeometry(desktop->screenNumber(lastPreview));
                                                                                                      ^

Change-Id: Iac3a5fe4931503c42c94428ac19cd1dcbfb277aa
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

The ignoreSymbol() function in class ClangVisitor was told
to return true for every name that starts with "qt_". This
was too aggressive, so the test is now done at output time.
If a function name that starts with "qt_" has no documentation,
qdoc does not warn with "No documentation for qt_..."
because almost all such names are not to be documented. But
they can be documented, so that's why the test is performed
at the last moment.

Change-Id: I2f322bed32dcae43336ead0735490560190d8095
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

When the CollectionNode class was changed from an Aggregate to a LeafNode,
its output to the index file was not updated. This change ensures that the
contents elements in collection nodes are output to the index file correctly.

Change-Id: Id19a1c974c10d54f6ff1d3499726bbfa1b98beda
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

This is a WS-only change to correct a lot of indentations, uses
of curly braces, and placement of else keywords. It had grown a
bit ugly.

Change-Id: Ic3c17765e3651738532653eeb653661d46bba35c
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

A findFunctionNode() tree search function was testing whether a matching
node was a macro without parameters and refusing to return it if it was.
This test is now removed. Even if the test was necessary in some strange
situation, this was the wrong place to do it.

Change-Id: I40b2293f5643d2d752c05e16f85782f57c0ccbf3
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

Remove the debug functionality from the Generator class and add
a logging category instead. Add some debug statements outputting
the command line arguments and clang arguments.

This makes it possible to obtain logging output by setting for
example QT_LOGGING_RULES=qt.qdoc.debug=true .

Task-number: PYSIDE-363
Change-Id: I3ecfe548e14aa3e2d03f19d07fc61a2647b75111
Reviewed-by: Martin Smith <martin.smith@qt.io>

Add library and plugin directory.

Change-Id: Ib232de3df5bc98b99ee237818ea7a521df5579f3
Reviewed-by: Christian Stromme <christian.stromme@qt.io>

This change makes sure that the plugins are deployed correctly

Change-Id: Ia967525bcbdf97f86385b68e5a4039f5b5f8ee20
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>

It was thought unnecessary to parse the \fn commands during the prepare
phase, but it is required to determine whether the functions should be
marked internal and private. Without parsing the \fn commands during
the prepare phase, the documentation can't be assigned to the function,
so it looks like it is undocumented and is marked internal and private
in the index file. That was wrong, so now qdoc calls clang to parse the
\fn commands, even during the prepare phase. Unfortunately, this slows
qdoc by a significant amount.

Change-Id: I51ab621bb9d4ffff0a245d3a842d6e7b4558ca84
Reviewed-by: Martin Smith <martin.smith@qt.io>

Shared comments nodes were not detected and handled correctly in
certain cases. This update fixes those problems to avoid trying
to output documentation for the individual nodes, when they are
sharing a comment. Only the shared comment node should cause
documentation to be generated for the nodes sharing the comment.

Change-Id: I4ad7afc0964b1b6836dd5a140aa874784974b139
Reviewed-by: Martin Smith <martin.smith@qt.io>

When the \fn commands in a shared comment are global functions
that relate to some class or namespace, the shared comment node
and all the nodes sharing the comment must be marked as relating
to the class or namespace. This update makes the setRelates()
function virtual, and implements a special override in the
SharedCommentNode to mark all the nodes in the collective as
related to the class or namespace.

Also added hasSharedDoc() to return true if a node is
sharing a comment and the shared comment is not empty.
It might be the case that it can never return false if
the node is sharing a comment, but the function is
convenient anyway.

Change-Id: Ie064364e72fd150eacdd51a0131fe730311ee892
Reviewed-by: Martin Smith <martin.smith@qt.io>

Fixes output of \since, \preliminary if associated with a module.

Change-Id: I760963135283d4978225e2ad72f3c0c6df852e56
Reviewed-by: Martin Smith <martin.smith@qt.io>

Both JSON and qdoc output files should be generated in UTF-8.

Change-Id: I7d60d9042bcc1e8d69e164691fcc4129d4e95fb6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

With macOS High Sierra, Apple machines using SSD see their file
system changed for APFS automatically.

hdiutil by default uses the current file system to build the dmg file
which in this case makes them unusable on older version of macOS that
don't have support for APFS.

This patch adds an additional option to macdeployqt to select the
file system to use when building the .dmg. It defaults to HFS+ which
was the official file system used until now for all currently
supported version of macOS.

[ChangeLog][macdeployqt][feature] Added support for selecting the
file system type to use when building a .dmg file. Defaults to HFS+
to support a wider range of macOS versions.

Task-number: QTBUG-65844
Change-Id: Ic66856344f96c6536b224d13d309715b34eb0874
Reviewed-by: André Hartmann <aha_1980@gmx.de>

Change-Id: Idbaae38cc24e36f1309995bf7c4f47a41c08db5c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>

Change-Id: I5f715ea279e879b7f41278d6f70b8fa1e64eda52

 Conflicts:
	.qmake.conf

Change-Id: Ia803aad211281c71a8d13b403d83fb5ec3b2cb2c

Task-number: QTBUG-34610
Change-Id: Ia1946079bd9b38eec27f6c5c8947bf9eeefa9ff1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>