| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
96b70c3a3e269c671f6ecae9c81a0cf7aad1f325 changed Q_DISABLE_COPY
to Q_DISABLE_COPY_MOVE in the public header
QDesignerNewFormWidgetInterface. Revert this part.
Change-Id: Ia978597b0752e99cb0fc3f8f3091c1d7dbc1b769
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
The functionality got moved to dev.
This reverts commit a79eaba195f3b235b4c8db79caa75e42b38664a8.
Task-number: QTBUG-78875
Change-Id: Iaccdfb9fe2e6a56eba9baf3d44961382834139eb
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix 0 as nullptr constant.
Stop using C-style casts:
- Do not cast to int that which returns an int (QString::length())
- Use static_cast<>() where it's sensible to do so.
Change-Id: I48c7a3e6f1465759dd3973eff66656a4f2a1c19a
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Improve the coverage of C++ test with the following cases:
* \macro taking an argument
* A non-related member (above macro) associated with a class
* \inheaderfile command
* \since command
Fix incorrect expected output since fixing the bug mentioned in
the task number.
Task-number: QTBUG-77960
Change-Id: I6010cab9ab0a86a1897a38a397b8d7ba8155f95a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This change replaces the use of foreach with range-based for throughout
QDoc. It also ensures that the loop body doesn't modify the container
being iterated over, by:
- Making a const copy when the container is a member variable or the
result of an expression, and iterating over that copy. This is the
preferred approach.
- Using qAsConst() when the container is a (static) member variable
or local to the method and not const. The latter is typical where
the collection is sorted immediately before the loop.
In two cases (doc.cpp), replaced Q_FOREACH + delete with qDeleteAll.
In two cases (cppcodeparser.cpp), the range declaration is replaced
within the loop statement. These rewrites express the behavior clearer
than the original code.
In two cases (codeparser.cpp), use a range-based for instead of a while
loop where the condition is an iterator, for more expressive code.
Finally, use the auto keyword where appropriate and improve a few
variable names.
QDoc warning count and generated output is unchanged after this
refactoring.
Change-Id: I64f02d24dca373a3a41402d535382e2c526bb55e
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
|
| | |
| |
| |
| |
| | |
Change-Id: I0d95efceff54a8b7f54ed5e79275f9de1a43b68b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
| | |
| |
| |
| |
| |
| | |
Change-Id: Ib3e66cc21ba5f96b5e8b35d6021d643317bd961d
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
| |\ \ |
|
| | |\ \
| | |/
| | |
| | | |
Change-Id: I5c06b3e0177fcccd988620ab269f75632689a54c
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The WebXMLGenerator did not handle atoms of type AnnotatedList. Adding
this enables listing of grouped pages with the \annotatedlist command.
Similarly, empty output page was generated for the \group page itself.
This was because QDocIndexFiles::generateIndexSections() only handled
groups when processing the root node, which we must skip in this
generator.
Add explicit handling for group nodes, enabling us to receive
callbacks from QDocIndexFiles to add content for these pages.
Task-number: PYSIDE-1088
Change-Id: Id72d589a51fc7aae21ad5cdbb3c1dfa78d4c23ae
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since QDoc no longer stores example files as nodes in its tree, the
WebXMLGenerator failed to generate output for those files.
Fix this by generating those pages explicitly as needed, overriding
functions from the Generator base class.
Prevent QDocIndexFiles from writing nested <page> elements when
WebXMLGenerator is in use, as that does not work as expected with
shiboken2.
Fixes: PYSIDE-1088
Change-Id: I01c2af2391726f448271fdb810ffc3da923caca5
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
That is, Q_PROPERTY types for custom types that have been declared
with Q_DECLARE_METATYPE().
Fixes: QTBUG-17816
Change-Id: I48c33af13d85b877596caca4fbd1103bf383d6e8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The \relates command sets a node as a related non-member of another
node, and sets that node as the new parent. However, the old parent
still holds a pointer to the newly-adopted node; this is needed for
searching. Some locations in the code did not handle the
possibility of parent's children reporting a different node as
their parent.
Skipping these nodes when traversing the node tree eliminates
duplicate entries from .qhp files. These duplicates are however
needed in the .index files for linking to work, as links may
reference both the global namespace and the scope the node
relates to.
Remove these duplicates from .qhp files, and omit parent names
when generating 'id' attributes for related non-members. This
reverts the .qhp content to what it was in Qt 5.12.
Parents of related members must be skipped when resolving the full
name of the node, otherwise searching for the name is likely to
fail.
Non-members related to a header file did not receive a valid
location ('href').
Task-number: QTBUG-78474
Change-Id: Ie126219e8101beaa051f2f4a1a9f93c731fc8168
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The fact that a related non-member has a parent-child relationship
with the node it relates to is simply an implementation detail in
QDoc - it should not be visible in the generated output.
The same applies for proxy nodes - i.e. aggregates that hold
children documented in another module.
Fixes: QTBUG-77960
Change-Id: I8d83ee7022d5f15af720cbd65c138be0469d39a0
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This sneaky regression happened as a result of rearranging the
inheritance tree of Node-derived classes.
HtmlGenerator::linkForNode() intends to add #anchor to a link if
it's associated with a Node that does *not* generate an .html
page of its own. It did this by checking whether a page is an
Aggregate. However, since the node tree refactoring, TextPageNode
instances are not Aggregates but do generate .html pages. This
caused excess '#' to be added to all links pointing to a \page.
Luckily, we have Node::isPageNode() which is designed for this
purpose - it tells whether a node has an .html file associated
with it.
Fixes: QTBUG-78040
Change-Id: Ie847c69c4df79075e950aea1ea30c0dcea4f2e4b
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | | |\ |
|
| | | | |\
| | |/ /
| | | |
| | | | |
Change-Id: I0015980f763599ca60f28dd3408531d2a532cd6a
|
| | | | |\ |
|
| | | | | |\
| | | |/ /
| | | | |
| | | | | |
Change-Id: Iee0b05ae295b1337bebbdc3c457795dfc5b56ced
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
+ b22049ea14b62a2a743fd5fbd23563c566ef528a qdoc: Add id attribute for all HTML headings
+ c7f96f5301c2e60d1c5ef1e945e70e921afc71ce Close the last SELECT query with pending results
+ 0d2a9408ed2a5c664330c5742c9afb610a6c7348 lupdate: Improve documentation of -recursive, -no-recursive
+ fcb96af0215a9ae070face3997cdf84dafc057e5 distancefieldgenerator: Fix cmap error for some fonts
+ 8e7db0dd1cdc63c962359b37f882643dd3ed0e1a distancefieldgenerator: Avoid exceeding max texture size
+ d7e346b58260b24e02c64f82b2900bfba5951330 distancefieldgenerator: Remove unused variable
+ a05eb132416fcce8eb6a9fb240d0867796ed9deb distancefieldgenerator: Fix crash with multiple textures
+ 73ecd39debe850c11293fcf175c1e2b637edc5f3 distancefieldgenerator: Fix failure reading CMAP for some fonts
+ 2ecbaa7c29de2350486c6e83375ba8c83fee6cda Qt Linguist: Document CMake macros
+ e42dd0a13ebf37f7402a4cf09a6fb62b8c740c76 qdoc: Avoid duplicating version strings in HTML <title> element
+ 86f264b491fced5efd37127ac1a31880fe909f5c Bump version
+ a9790627873d17f91f29c9bd8be0fb609ec29f03 CMake: Ensure unique lst file name in qt5_create_translation
+ a690022b7e56b2e36a95ef22b854af4c82c5fdc8 Qt Designer: Enable editing of current dates
+ 40a7f2c6469e1702e791c66414051fed385a7930 distancefieldgenerator: Fix garbled text with large fonts on little endian
Change-Id: I9dcfc3d86ec7744aadeb24e4fc1b293503373d86
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
JS template literals do not really mix well with the Qt Linguist toochain,
at least if template arguments are used: This makes the source string
dynamic.
So far qsTr(``) calls were just ignored. Now lupdate prints a warning.
Task-number: QTBUG-76265
Change-Id: I935c382695a86ecd6fd076b31a68fa987be8fd84
Reviewed-by: Lucie Gerard <lucie.gerard@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| | | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Calling the QItemSelectionModel::select() function that takes a single
index is extremely slow, so for large ranges that span e.g. 20000 glyphs
in the font, such as some of the Chinese ideographic ranges can, the
application would appear to freeze for many seconds while updating
the selections.
Instead we use the overload that takes a QList.
Metrics: For a specific CJK font, this reduces the time taken when
selecting a single unicode range from 30 seconds to 70 ms.
[ChangeLog][Distance Field Generator] Improved performance when
selecting unicode ranges in large fonts.
Task-number: QTBUG-77499
Change-Id: I7ed9bec26b3cbc7e273d305f270a4a6690a81407
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
| | | |\ \ |
|
| | | | |\ \
| | |/ / /
| | | | |
| | | | | |
Change-Id: If1fddd3261c81631773ac281d4f79e5e03b96bd7
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | | |
Change-Id: Ief65f3477b5e5023f8a0c940898c9ddd63a67d51
|
| | | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: I9390352a6e8a8802b99c5aac0bb39ae1d11399f7
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: Ic1048e96daf722cae95fd6625455e55eb016ce0e
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Validate different ways of linking to other documentation topics.
Fix the incorrect expected output in the existing tests.
Task-number: QTBUG-78040
Change-Id: Idb6bf9c79ec99894e2fe0ddb7e65150204c96627
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Previously, this problem was masked as the Config object was local
to the processQdocconf() function in main.cpp - but now we keep
that object and process multiple .qdocconf files in single-exec
mode.
When in single-exec mode, the previously read variables remained
in the config, resulting in all kinds of unintended consequences
- such as processing source directories from other documentation
projects.
Fixes: QTBUG-78776
Change-Id: Ic23d1cb0eacb112cc60a63cd43b4d51ff57f0583
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This change moves the setting of configuration values from main's
processQdocconfFile() to an overload of Config::setOptions(). This is
done as a first step in a move to set configuration values in the
Config class, without going via the QDocGlobal class. Thus, we can
eliminate large parts, if not all, use of the QDocGlobals class.
As a nice side-effect, this also saves redundantly repeating the same
transcribing of data from globals to config, once or twice as many
times as there are qdocFiles.
Change-Id: Iaa11008b9c67781f7ff004a8be4675a02610f58f
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Except for for QDocGlobals::dependModules(), as it returns a reference
which would drop the const qualifier.
Do this as it makes sense that getters are const anyway; also it allows
for further refactoring of the relationship between main.cpp and Config.
Change-Id: I552edeaa3fe9cb8d0b326402bf8af4b63afe910a
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Move a variable to where it's used.
Remove unused code that's been commented out.
Change-Id: I240265c8eded345b40c988fa50e1618bff530345
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
In addition to line number, display also the name of the tested file
on failure.
Change-Id: Icea00c94e176265bd3d91b6e7301b514bea88048
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Use range-based for loops for more expressive code. Use qAsConst on
static non-const containers in loops that are not supposed to modify
the container.
Change-Id: I3f1083880de7f8b922eb7a5378482f352ebcec39
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
A regression was introduced when refactoring QDoc's config system:
the processQdocconf() function in main.cpp no longer constructs a
new Config object; instead, it sets some config values using
Config::setStringList(). However, unlike its name would imply,
this function did not (re)set a config variable, it added to it.
As a result, when in single-exec mode, the first call (prepare phase)
to processQdocconf() worked as expected, as the default boolean
variables were set as QStringList("false"), which is correctly
evaluated to false. During the second call (generate phase),
calling Config::setStringList() again resulted in 'false' boolean
variable to be stored as QStringList("false", "false"), which
evaluates to true.
These boolean variables include REDIRECTOUTPUTTODEVNULL, which
unsurprisingly caused problems as it was always set for single-
exec builds.
To fix this, make Config::setStringList() behave as its name
implies, add insertStringList() function to add to an existing
variable, and fix the code that tried to combine two string
lists to use this new function.
Fixes: QTBUG-77897
Change-Id: I62282f31c35e47e4791919688adb4ff49fd2e2df
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Add a contents widget as it otherwise cannot be edited.
Fixes: QTBUG-78138
Change-Id: I5a77b0d90ddf18666212b03ab84eb707642fff41
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Undo the overzealous QStringLiteral() use introduced in the early days
of Qt 5. Strip the newlines and use raw strings for clarity.
Task-number: QTBUG-78138
Change-Id: I07ae3180d075e52bae9e1ea594e404f171aa87e7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
It starts well below 0.5s, and having the splash screen flicker
around in that time is more of an irritation than it helps.
Change-Id: I30648512714e588fca90f22c175bfcb7dd0f8b40
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The reasons:
1) Patching is not needed anymore
2) It will fail in a Release build because the symbol
windeployqt is looking for is optimized away.
Task-number: QTBUG-15234
Change-Id: I930b5470f038778bf7e3aa8d82e5d11fccc9f001
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
After qtbase/4ac872639ed0dd3ae6627e05bdda821f7d128500, can
fail for relocatable builds:
Unable to patch ...\Qt5Core.dll: Could not locate pattern "qt_prfxpath="
Task-number: QTBUG-15234
Change-Id: I6df337b369d5e4c461293193bfe1c63e08b7fd35
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This will be expanded later on. The minimal C++ project tests QDoc's
HTML output for a module page, namespace and class reference, and
some class members.
Change-Id: Ifabc394116b675152d3ac95dc96a46e6e9c768ec
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Streamline the process of adding new tests/files, by adding a
helper function to both run QDoc and compare the generated
output with expected data.
Add a way to pass extra command line parameters to QDoc.
Change-Id: I04870c18ae3d31ae07115d3d8f5d3c77d090418a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |\ \ \ \ \ \ |
|
| | |\ \ \ \ \ \
|/ / / / / / /
| | _ / / / /
| | / / / / |
Change-Id: I5181ad434c3084b4143268c735ea544bd7207025
|
| | |\ \ \ \ \ |
|
| | | |\ \ \ \ \
| |/ / / / / /
| | | | | | _
| | | | | | |
Change-Id: Id2b91b27583724cfd289f264724aa780edcccbde
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Update screenshot.
Fixes: QTBUG-65064
Change-Id: Ic8d1201e0f2947419836d633bc53997d009d646e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I31313d1d941a0fe37bd515b5e52b5a471e6167e5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Bring back the typedef removed in f562ee4402c957d66f4a5ae5b39cd2679d0c4b24
to prevent SIC in Qt 5.
Change-Id: I08117d524bf1da2af9992bfd3ad5a8d28623e85c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: I4cf54be2bdab30def3620ac44f45d32ad6c7e9a4
|
