| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| | |
Change-Id: Ief65f3477b5e5023f8a0c940898c9ddd63a67d51
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Plugins *for* Qt have a MetaData object with Keys, but application
plugins don't necessarily have that. Let's still make qtplugininfo
useful for those plugins as well.
Before:
$ qtplugininfo /usr/lib64/plugins/kcm_colors.so
qtplugininfo: /usr/lib64/plugins/kcm_colors.so: invalid metadata, user data is not a JSON object
After:
$ qtplugininfo /usr/lib64/plugins/kcm_colors.so
IID "org.kde.KPluginFactory" Qt 5.13.0 (release)
qtplugininfo: /usr/lib64/plugins/kcm_colors.so: invalid metadata, user data is not a JSON object
Change-Id: Icfe55e4d1749b5d31db1787883487f33987263b3
Reviewed-by: Volker Krause <volker.krause@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
| |\ \
| |/
| |
| | |
Change-Id: I9390352a6e8a8802b99c5aac0bb39ae1d11399f7
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The "Inherited By" list was incomplete for QObject (and other classes)
because classes that inherited QObject from modules outside QtBase were
not being included. This update cleans up the maintenance of a class's
base class and derived class information so that the "Inherited By" list
is more correct.
Note that the "Inherited By" list can't be guaranteed to be complete
because, for example, classes in external modules might inherit QObject,
but if those external modules are not listed as dependencies of QtCore,
QObject won't know about those classes.
Task-number: QTBUG-77126
Change-Id: Ia0be361f9e909fee04e9680d4219c96812306712
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | |\ |
|
| | | |\
| |/ /
| | |
| | | |
Change-Id: I0e4b55a4dd87223f15a6933b45e5bcb8c41ee439
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Qt Designer uses QLocale::ShortFormat for its date editor, which has a
2 digit year. This causes the year to expanded to the wrong year
(99->1999) for the maximum value and other issues.
Fix by making the year 4 digits.
Change-Id: I6cb73c5027f340706f44cd5fe3bfec5e90facb46
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |/ /
| |
| |
| |
| | |
Change-Id: Ic1048e96daf722cae95fd6625455e55eb016ce0e
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
| | |
| |
| |
| |
| | |
Change-Id: Idfaf778aa13cb461bb9e0db344033aa8147a51d3
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When qdoc finds \reimp in a function node comment, it searches the parent class
node's base classes to find the function node for the function that is overridden.
When it finds this node it prints the "Reimpliments: Yyy::Xxx()" line in the current
function node's documentation. This was not working correctly when the reimplemented
function was in a different module. The problem was that the fact that the function
in the base class had been documented was not recorded in the index file. This update
fixes that problem. Now every element that was documented is given the "documented"
attribute in the index file set to true.
Sometimes, \reimp is used to say that a function reimplements an access
function for a property in a base class. This update handles that case
as well. See QToolButton::sizeHint(), for example.
This change introduces a 6 new qdoc errors in QtBase about \reimp functions for
which a documented base class function was not found.
Change-Id: Idd444958c3118ade97642bf84781166e6ca8f036
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When qdoc finds \reimp in a function node comment, it searches the parent class
node's base classes to find the function node for the function that is overridden.
When it finds this node it prints the "Reimpliments: xxx()" line in the current
function node's documentation. But the search for the overridden function is meant
to be recursive. It was working recursively, but the search was ending prematurely
on a function node that had no documentation. In that case, the search should go
higher in the inheritance tree to find an overridden function that is documented.
This update adds the hasDoc() test to that search function to ensure that the final
matching function does have documentation.
Change-Id: Iaf6481f8b3aa98df0d0ef188912f1338316f079a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Even if a class declaration appears in an _p.h file, a doc page must be
generated for it if hasDoc() returns true for the class node.
Task-number: QTBUG-77026
Change-Id: I6ca7d614383aadfb6ffcae1c8e021d2998de6a9d
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |\ \ |
|
| | |\ \
|/ / /
| | _
| | |
Change-Id: I0b7c7105d6c6df81a1c955b7edf475b5f173c1d2
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
get_filename_component(... NAME_WE) will remove all suffixes, so files
like myapp.de.ts and myapp.en.ts will return the same base name.
To just remove the .ts, we could switch to NAME_WLE, but that was only
introduced in CMake 3.14 it seems.
But why bother at all? The lst file name doesn't have to be pretty...
Fixes: QTBUG-76723
Change-Id: I42e46310fe5e9cfb0a82f303ade700f3f0b1b600
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The algorithm for finding the class qualifier for the function name
in a \fn signature was incorrect in cases where the return type also
had a class qualifier. This resulted in some clang error messages
being printed when they should not have been printed because the
class was marked internal. This update corrects that algorithm.
Change-Id: I02983710c73251b8fc75ccb2893ae1d9f5aa0fe6
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |\ \ |
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: Iccf7484bf2a1e808aa35043bdd6e907fed13116c
|
| | | |
| | |
| | |
| | | |
Change-Id: I692a0dadebd51ee082232a65284b3a233e57561a
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add missing nullptr check.
Fixes: QTBUG-76930
Change-Id: I2dc99db43b12cebc6fbe9024057ba963e0ae470f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
| | | |
| | |
| | |
| | |
| | | |
Change-Id: Idabe3da9104c3b0d590146d320faff547cfaa7c4
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |/ /
| |
| |
| |
| |
| | |
Task-number: QTBUG-74391
Change-Id: Iced8f21af188b249a0ac59f71fa2fb7cb6a52869
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | |
| |
| |
| |
| |
| | |
Task-number: QTBUG-76289
Change-Id: If51fa339cd65d793e8f83a358561bf3be340a0ce
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This update fixes a regression where the signatures of global functions
declared in header files were being erroneously qualified with the name
of the header file. The incorrect qualification is removed.
Task-number: QTBUG-76822
Change-Id: I59ddee9cdeb5cad45afab7f0b4a50e90bde1578c
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The summary lists for subclasses were being populated with members of
the bases classes of the subclass, which was wrong. This update corrects
that problem. More testing is required to ensure that this fix does not
introduce regressions.
Task-number: QTBUG-76812
Change-Id: Ife7242e99f57c90326d8315ffb3d8175fb9dc8b6
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fixes: QTBUG-73626
Fixes: QTBUG-73627
Fixes: QTBUG-73628
Fixes: QTBUG-73629
Fixes: QTBUG-73630
Change-Id: I14b5521ed28e8352e3bcef82103243159ff36073
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Earlier implementation was incorrect as it omitted generating output
for classes that have only non-function members. Also, it incorrectly
generated output for private, non-documented classes.
Simplify the criteria for generating output; filtering based on the
appearance of 'Private' string is not necessary for Qt, and may
cause problems for projects external to Qt.
Fixes: QTBUG-76892
Change-Id: Ieee6a693f887cbc0244753298f13a9b411801d56
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This update fixes a regression caused by the introduction of the
docMustBeGenerated() function. The doc for header file nodes was
not being generated because docMustBeGenerated() returned false
for the header file nodes.
Change-Id: I8bafd9e2ae96f41c8e7592403e3d9722797e5c24
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |\ \ |
|
| | |\ \
|/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/qdoc/clangcodeparser.cpp
Done-With: Topi Reiniö <topi.reinio@qt.io>
Change-Id: I343d2ae6ab3a381756c4476c7f3f5ba0212ad43c
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
A complaint about excessive logging was received because of the logging
of each guessed include path when qdoc is not given any include paths
at all. This update removes the logging of those lines and changes the
remaining single log line to: No include paths passed to qdoc; guessing
reasonable include paths
Task-number: QTBUG-76204
Change-Id: I000ee7959f00f654e750ac1b68a0c2b6dcccd472
Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit 8e3c53a196f66a1c9a370cda1dfde51792f92364)
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Commit 50a172f8 broke the way QDoc parses include paths passed
from qdocconf files by always prepending them with '-I'. While
this ensured that Clang uses them as include paths, QDoc no
longer found module headers local to the documentation project
as '-I/path/to/module' is never a valid file system path.
This change fixes the issue and removes duplicated and
unnecessary code.
Fixes: QTBUG-76279
Change-Id: I7006000ec6be823afd10bae59eb88780ccf32b23
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The function took the parent node's location without checking whether
the parent is the root namespace. For example nodes (and possibly
others), this meant that we got an empty location. This in turn
resulted in QDoc omitting the 'href' attribute when writing an .index
node entry for an example node, and consequently, linking failures.
Fixes: QTBUG-76171
Change-Id: I984ada1b88468aab71d08ba7d102bd8661304dab
Reviewed-by: Martin Smith <martin.smith@qt.io>
(cherry picked from commit b18d7b5b4a9bc516bea9f36e3b00084cf6f11e26)
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This update lets qdoc accept include paths with or without the -I
and with or without a space between the -I and the path. Without
the space is preferred.
Task-number: QTBUG-74675
Change-Id: I4a1dcc04a3c9a6586e24b50bccf0f1f37d02ed4c
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit e33ac6f1b1ebb882684f24f7d026267584d9393a)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Under certain conditions the '-I' prefixes survive in the list of
resolved include paths.
Fixes: QTBUG-76026
Change-Id: Ie3543b5aa8b88d8021175b3168ab8de8a4497878
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qdoc was building the obsolete QML members files incorrectly. It was listing
the active members when it should have been listing the obsolete members.
This update fixes that bug.
Task-number: QTBUG-75785
Change-Id: I37a5469cd51c5b15bf3edac9e8bd98c2894bef1e
Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Commit 72eac2f5 introduced a regression where \headerfile pages never
generated any output. Since that commit, Node::docMustBeGenerated() is
called for HeaderNodes, and we need to override it; otherwise the
default base implementation gets called, and it simply returns false.
Fixes: QTBUG-75790
Change-Id: I4932d5ba8dd595ad4d18033f77e62b14b54f8263
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: I5086b60e0c23f990c65ae386eb4ea8f74d43893d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There were multiple issues with QML properties, methods, or property
groups that share comments:
As we don't handle \qmlpropertygroup anymore, QDoc assumed that every
\qmlproperty that shares a comment belongs to a property group, and
tried to resolve the group name. But for some properties, there is no
group name as they are just properties sharing a doc.
For details section of QML reference page, any shared comment was
assigned to 'Method Documentation', which is clearly wrong.
Also, fix a typo where we looked for C++ functions when generating
QML method documentation.
Fixes: QTBUG-75647
Change-Id: I11cef407b39fdc926a5410b867e8b17a8d769937
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
| | | |
| | |
| | |
| | | |
Change-Id: If2c1f5ce2b21f92832eb07ec6f413c9e83bbaaeb
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qdoc was not sorting qualified class names correctly for inclusion in the
All Classes list. For example, QAttribute (Qt3DRender) was being placed in
the list in the position for Qt3DRender::QAttribute instead of the position
for QAttribute (Qt3DRender). This update corrects that bug.
Task-number: QTBUG-76506
Change-Id: Ie837ab45e20569b4afd578341dbce9ee6fd9c08b
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |\ \ \ |
|
| | |\ \ \
|/ / / /
| | | _
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: I3a828f7cf61510f0bb179b760c8a335629d3c852
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Commit 802aa37f introduced full version strings into the titles in
HTML header. However, for pages that already included a prefix
of the version information (e.g. 'Qt 5.13'), this meant that
the version appeared now twice ('Qt 5.13 5.13.0').
This commit checks for the presence of a version prefix in the
title and only appends the full version if one is not found or
does not match with the project version (which for Qt modules is
QT_VERSION).
Fixes: QTBUG-74301
Change-Id: Iceb3cf8f0e0181709e547a87cb6e92a6a13dcfef
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-72159
Change-Id: I817e1d562675c0aa462706a1e90e758030ce7d1e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If all the range offsets in the type 4 subtable in CMAP
is equal to 0, there is no need for a glyph ID array, so
this array can actually have zero length.
We did not account for this, and would fail to read those
fonts.
Task-number: QTBUG-76188
Change-Id: I11873fba7214d179af1fcd7ccff9a9fd1c72ce10
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We need to make sure the allocated area starts at (0,0),
since we allocate a texture at [width x height], and this
would be too small if it did not also account for possible
gaps at the top of the cache. This happens because glyphs
may sometimes end up at the edge between two textures, in
which case we will reserve space for them in the second
of the two even though this is not needed.
So this is a deficiency in the cache logic itself, but
we need to at least make sure it does not crash.
[ChangeLog][distancefieldgenerator] Fixed possible crash
when generating large number of glyphs with a small texture
size.
Task-number: QTBUG-76188
Task-number: QTBUG-76528
Change-Id: I84c87c72985f5b621d120e7526cfe071555fa7f8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
The total allocated area was never used.
Change-Id: I1aad1d4349ec94e2ccc521903b304270decd1d0d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since we use a single area allocator for all textures,
a glyph on the edge between two textures, would end up
spanning two textures. It would be assigned to the first,
and which in turn would be expanded to account for the
additional data. The result was that the texture height
exceeded the maximum size set.
This is actually an inherited problem from Qt Quick, but
it happens more frequently with the distancefieldgenerator
because you will typically generate a large number of
glyphs, and also the default max size set is quite low
to be on the safe side.
The bandaid in this patch is to pad the texture height by
the size of one glyph, which will for the most part get
rid of the problem, except for fonts where a majority of
glyphs exceed the em square.
[ChangeLog][distancefieldgenerator] Fixed a bug where the
generated textures might exceed the maximum height.
Task-number: QTBUG-76528
Change-Id: I51487bbf7c46556b022bfd45cefc8776d0272de3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | |\ \ |
|
