| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
\typealias was already a command recognized by QDoc, but it was simply
treated as a synonym for \typedef and was not documented. Implement
proper support for the command:
- Add [alias] designation both in type summary and details.
- Auto-generate information about the aliased type, including a link
if aliasing a public, documented type.
- Auto-convert aliases documented with \typedef to type aliases.
- Add basic support for aliases also to DocBook and WebXML generators.
- Document \typealias.
Fixes: QTBUG-82712
Change-Id: Iafa8c7def0a7488d7521fbc2862290a9bb3167ff
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
After following a link to look up a keyword, resizing the width of the
window would lead to the looked-up position being scroled away. This
fix is adapted from the corresponding fix in Qt Creator,
https://codereview.qt-project.org/c/qt-creator/qt-creator/+/274996
Fixes: QTBUG-34525
Change-Id: Ia9c2aab4b2c8039965eff098ff51dbdcc4967a01
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When using an \fn command to document a function that has default
values for parameter(s), The Clang parser retrieves a relevant
section of the source file that contains the expression for the
default value. In case of \fn, the source is a temporary translation
unit that was constructed on the fly - but it may not exist anymore,
and the default value is lost.
Fix this by storing the contents of the temporary TU for later access.
Fixes: QTBUG-83472
Change-Id: I20ad9e3322636450db1def65933837c1c767f2c4
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|\ |
|
| |\
| | |
| | |
| | | |
Change-Id: Ie46e3fab55d3641f058446c35e8333d2d6626b54
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Note that one has to restart their build shell after installing
llvm with the pre-built installer on Windows.
Task-number: QTBUG-83429
Change-Id: Ife15ba8179bb53930315f597f05c09bd1a12cbeb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fixes: QTBUG-65585
Fixes: QTBUG-68280
Change-Id: I7843e2d597e27c2d46ffcafe67b6bfd624770455
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
And add 'QDoc' as a word ignored for auto-linking.
Change-Id: I16a33b8448e8bfa340f4c62149f702fea13d5533
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There was some old code and documentation for this variable, but
using it had no effect on the output. Similarly, the \generatelist
command no longer recognized the edition-specific parameter.
Fixes: QTBUG-83367
Change-Id: I42a1e67855ffd781e326e9d89cec0dde51cb14d0
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
With Xcode 11.4, in some cases it will have ", weak" as part of the
framework description when running otool. Therefore we need to account
for this so it still sees it as a valid entry.
Cherry-picked from branch: dev
Change-Id: I4018d42aa54f4e6434ee6defa119f3c913893819
Reviewed-by: cherrypickbot
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Also remove references to qt.qdocconf which was specific to Qt 4,
fix documentation for the related variables ('indexes' and 'project'),
and link to them from the table of contents.
Fixes: QTBUG-37806
Change-Id: I1a5884f505c0ff2d2f4e2072cccb0c77f9ed04ff
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Information on reading and writing index files is only needed
if -debug is set.
Change-Id: I0bfe2469e0a6a6cea3dd9a59ed5cc4838638ae88
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Ensure new connections are visible and selected.
The order of statements in Add/DeleteConnectionCommand
needs to be changed for the model indexes to be valid.
Cherry-picked from branch: dev
Change-Id: Ib66ab86a085e47829cc5c8c0c6da78c9a7321748
Task-number: QTBUG-82924
Reviewed-by: cherrypickbot
|
| |
| |
| |
| |
| |
| | |
Fixes: QTBUG-82399
Change-Id: I055d72db87ef6f568f19302c8baf44eaa35e0268
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
For notarization to succeed, several options have to be activated when
signing the application:
* the hardened runtime has to be activated
* a secure timestamp must be generated
* the application has to be signed with a Developer ID certificate
Add the option sign-for-notarization to conveniently activate both
options.
Change-Id: I7ddf3f36091f4d5d081166d32f65a4ab446536ce
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Apple now requires the developer to include a secure timestamp in the
application's signature in order for notarization to succeed.
Add an option to do this to macdeployqt.
Change-Id: Ia884de80822661abcf65a287e4dc8429ec24b766
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The implementation was broken in the sense that it would
return column text strings for the font/color roles since enum
deprecatedMember was 0.
Restructure the code to use a switch and a helper for the column
text.
Cherry-picked from branch: dev
Change-Id: Ifb055519b796d4323c3aac7bf24ccac8facf1497
Change-Id: I43a9c7e9f48ecb2e51849ce53e939c80aae54d5a
Task-number: QTBUG-82924
Reviewed-by: cherrypickbot
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A recent refactoring of code related to generation of example file
lists caused a regression; if the parameter passed to an \example
command contained subdirectories, e.g.
\example tutorials/gettingstarted
only the immediate example directory ('gettingstarted' above) was
recorded in generated example lists and manifest files.
Ensure that the file paths are prefixed with the full example
location, and add a test to cover this.
Fixes: QTBUG-83130
Change-Id: I061dcf6cd4e94a2c65e5a50a39f379759d7cd06f
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I9d1c9126b526161aa58c9068bca30ef6dd1ac7fb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ie3c74010c62fa6c468732364bd1be77024fcca5b
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QDoc allows macros to be nested, and macro parameters can also be
other macros, but in one code path the parameter was read verbatim,
i.e. not expanded. This is an unnecessary restriction so remove it.
Fixes: QTBUG-83085
Change-Id: I6dc7c2f7586a65bee78096fb50685262dad2ffe3
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/qdoc/clangcodeparser.cpp
Change-Id: I2ba822fde6c50ea782839de7d5cb155354c33b52
|
| |
| |
| |
| |
| | |
Change-Id: Ia150b72a064e39bc25cca774a337b44d9127c1e0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When qdoc is built with QDOC_PASS_ISYSTEM define, it is possible to pass
-isystem options to qdoc, and it will forward them to clang.
Commit ce895f066579f71d fixed handling of the -F option, this commit
fixes the -isystem option in a similar way.
Change-Id: I876546650354ca3ee7f6edd216fd38b3d1a17285
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Even though it was documented to use -F to pass framework paths to
QDoc (macOS), that was not working and instead passing
"-I-Fthe_path_that_was_specified" to Clang.
[ChangeLog][qdoc] Fixed "-F" option on macOS
Task-number: QTBUG-82252
Change-Id: Ib85e3affad5487e428a8eccf0c239b437c75b759
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QDoc looks for project file(s) in the example directories
before generating docs for the example. Now that we are
moving towards CMake, it's ideal that qdoc is aware of this
new project file type.
Refactor the code that looks for project files - add a new
function to Config for this purpose, and store the project
file name into ExampleNode. This allows removal of
duplicated logic when generating the example-manifest.xml
file.
Add a unit test for Config::getExampleProjectFile(), and
modify the generatedoutput test to cover output for a
CMake-based example.
[ChangeLog][qdoc] Added support for CMake-based example projects.
Fixes: QTBUG-82908
Change-Id: If9f061c613fee94b35df277043c2f4df93da7ec0
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In single-exec mode, QDoc loads a master qdocconf file containing
a list of paths for each doc project that is part of the build.
These paths were considered relative to the current working dir,
meaning that one could not use paths relative to the master file.
Fixes: QTBUG-82918
Change-Id: I44208620f59fec17f4e35d63852cfaf9f035ab24
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The usage of QMap as a multi map has just been deprecated.
Adapt the QtHelp API accordingly. Introduce QHelpLink data
structure.
Fixes: QTBUG-82334
Change-Id: I8ff15710b1a433ddcb3000e5bcf58790c983e63f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
* Prefer list initialization
* Unify member variable naming (prefix with 'm_' rather than postfix with '_')
Change-Id: I603d184cb455e0523f7a2ab53abea6a0c8872403
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
I only need qdoc from qttools, but building the other tools takes up
quite a bit of time. qdoc already has a configure feature, so account
for the rest of them.
Change-Id: I0fc60393a1841229025c42b83d06f01668eb2680
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The command is deprecated and has no effect apart from generating
a documentation warning.
Drop the command also from the output generated by qtattributionsscanner.
Change-Id: Ic286909215d55f4062ea0af790bfb9be91747a98
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Even though the \noautolist has been documented to work for C++ module
pages, using it within \module documentation had no effect. Generate
the list of namespaces and classes only if \noautolist does not appear
on the module page.
Add a test for \noautolist, for both HTML and DocBook generators.
Fixes: QTBUG-82822
Change-Id: I27dcdafaa44981f18d08f2f27a148a1febba2d8a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This resolves some potential compile issues related to standard GCC
headers.
Fixes: QTBUG-69560
Change-Id: I17e0a90eca4384cd8b2171e53cee83cc77f7e1ab
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The \contentspage command doesn't produce nav links to the contents page
between the next and previous pages. QDoc hasn't generated these links
in html output since Qt 5.3. Remove the documentation that refers to the
command and add a warning that it should not be used..
Task-number: QTBUG-75170
Change-Id: Ib16fc1cbb1e661a7519ba650e655e209c3b45b68
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Commit 5234c7fc fixed an issue with missing \inmodule commands,
but it ended up adding non-aggregates into the module as well
which was not the intention. This caused excess nodes being
listed as a module members, causing issues for the WebXML output
format as well.
Partially revert 5234c7fc, fix the issue correctly, and update
the test for .index files.
Change-Id: I85fc19152b3de8993f92361fbe1ad2fd934c79ae
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
After processing a source file, we need to clear any potential stored
namespace scope. Left uncleared, if the next source file is not parsed
with Clang but still use ClangCodeParser::parseFnArg(), the incorrect
scope is applied.
Change-Id: Iba1e791ac01c0f1c699a808ce644b4edbb682399
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ib7dbb54c0a2d8ea7b754edc8fb7d2175471acc38
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: If65d87e520f228997a857dbbebc13d98fa9ce994
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
..\distancefieldmodel.h(197): error C2027: use of undefined type
'QPainterPath'
Change-Id: I3c97811a14bb82bf5dabc86398ffcfc9cf4ff58d
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Shared comment nodes were not handled as a special case when generating
"This [class/function/method/type/etc] was introduced in" strings when
QDoc encountered a \since command. These ended up with the default
value, "documentation", which led to unexpected text in the
documentation.
* Add handling of shared comment nodes and get the node type from the
first node in the collective.
* Amend generated output test to cover this scenario.
Fixes: QTBUG-82534
Change-Id: I444e95e0214f312649ec2720c23c98e698402abf
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Construct the signal handler name and generate a note for it.
This eliminates the need to maintain such notes in the source.
Remove the hard-coded notes from the test source (but not from
the expected output data).
[ChangeLog][qdoc] QDoc now generates a note for the name of
the corresponding handler in \qmlsignal documentation.
Task-number: QTBUG-37355
Change-Id: Ia3ab98be909a41bde619224c9a616cb8704e258a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Function nodes may have a number of automatically generated notes
added to the documentation; as they share the same formatting,
collect them into a single virtual function in Generator, and
override it in DocBookGenerator.
Call the virtual function in Generator::generateBody() after
generating the text for the Doc instance. As we append the
notes to the body, the order in which the notes appear
may change slightly (if a function comment generates multiple
notes).
Add \note commands in the tests in preparation for a follow-up
commit that utilizes the refactored code.
Task-number: QTBUG-37355
Change-Id: Id92926e53b61e03a2d2feceda70987191b708975
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The code that generates Qt Help Project (.qhp) xml files was suffering
from multiple issues - mostly related to changes in Node inheritance
that were not reflected in HelpProjectWriter implementation.
- We no longer have subtypes for page nodes. Therefore, selectors like
'doc:example' were broken. Simplify the selector code but continue
supporting the old notation.
- Examples and basic QML/JS types were incorrectly dropped from the TOC.
- Node::Union and Node::Struct were called 'Class' in the .qhp. Use the
Generator::typeString() to fetch the correct type name for all types.
- Require .qhp subprojects to have at least a title to avoid empty
subsections in the TOC.
Add a test that covers the entire .qhp generation with different types
of subprojects defined.
Fixes: QTBUG-82671
Fixes: QTBUG-82674
Change-Id: I8fe4a8ad5fc6d58f86e0e9128e98c0b8c4ba4a6a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Use PM_LayoutLeftMargin, PM_LayoutHorizontalSpacing instead of
PM_DefaultChildMargin, PM_DefaultLayoutSpacing, fixing:
formeditor/formwindowsettings.cpp:11452: warning: ‘PM_DefaultChildMargin’ is deprecated [-Wdeprecated-declarations]
formeditor/formwindowsettings.cpp:116:53: warning: ‘PM_DefaultLayoutSpacing’ is deprecated [-Wdeprecated-declarations]
A child widget needs to be passed to PM_LayoutLeftMargin to
correctly obtain the child margin.
Change-Id: Ided8fb45d2372a56bae3a0304c35339fcc3b83ee
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* Keep track of use of DocBook extensions in Config.
* Let Location query Config about use of Timestamps in logging.
* Set writeQaPages in Config and get it from there.
* Let Location query Config about whether logging is enabled or not.
* Let Config track if QDoc is running in single or dual exec mode.
* Move phase information to Config and track the current phase state
there.
* Remove the inclusion of generator.h from config.cpp,
clangcodeparser.cpp.
Task-number: QTBUG-82106
Change-Id: I06c8aeb40417e5c83cfa693f5f1ab2c210d34469
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Use the logging category framework for all log messages that used to be
issued by logToStdErr. Remove the method so that it doesn't suddenly
creep back in.
Change-Id: I7ca1152332e65c3698941f94d63de4a5f34902e7
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Use the logging category framework for all log messages that
used to be issued by logToStdErrAlways. Remove the method so
that it doesn't suddenly creep back in.
Change-Id: I65131bd01b5c79d6eab9619d9bb9b7bf6ff279c1
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I3b8225cc6bb175df67d958763597f764acfc8d81
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Use split behavior enumeration from Qt, fixing:
qdbusmodel.cpp:308:75: warning: 'SkipEmptyParts' is deprecated [-Wdeprecated-declarations]
Remove the dock widget feature settings from Linguist since
all features are enabled by default, fixing:
mainwindow.cpp:302:45: warning: 'AllDockWidgetFeatures' is deprecated [-Wdeprecated-declarations]
Change-Id: I72ada0dcbc81792d8643fc0948d86ea08847a8ec
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix warnings:
qttools/src/assistant/help/qfilternamedialog_p.h does not have the "We mean it." warning
qttools/src/assistant/help/qhelpfiltersettings_p.h does not have the "We mean it." warning
qttools/src/assistant/help/qoptionswidget_p.h does not have the "We mean it." warning
Change-Id: Id9f9ce61f110ad05c7676004f5ac372b275ce634
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|