| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Map QLatin1String("...") to "..."_L1, QStringLiteral("...") to u"..."_s.
Pick-to: 6.5
Change-Id: I2f6b2bf94bbcc982d90363a735d048f7eb5cb946
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Use qsizetype instead of int.
* Remove unnecessary variable 'startLine'.
* Replace a while loop with a for loop.
* Replace nested conditional statements with (A && B).
* Fix a corner case where a lone snippet tag at the last line of
included file caused out-of-bounds access of the line buffer.
Pick-to: 6.5 6.4 6.2
Change-Id: I0b1009cf122681bcf700b67040a3d0ca19e82378
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-111464
Change-Id: I1dbe83370d8d3dcbb54308c80f2fad6725f777fa
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-111464
Change-Id: I994a6173bcbabea13ed22280ae95a7235b193147
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-111464
Change-Id: If69dff20a09dc2fb5444462d6356b58b805ee3a9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Amends 1f859ca1ac6d337aedde2fe8eed74266416ae0d1.
As a drive-by, remove the outdated arthurplugin-demo.png.
Task-number: QTBUG-110447
Pick-to: 6.5
Change-Id: Iead32aaca944a886d86dd36465a2082309821be7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
If the 3rdparty libs are not built with -fPIE enabled we cannot link it
to the tools. Disable the flag until provisioning got the proper
update.
Change-Id: I25aa3dcec480219e3d29225ee517d9a910a1966e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
| |
Change-Id: I825071e9e0c1b2019266250cea01f283a48f4554
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
| |
Pick-to: 6.5
Change-Id: I7b069537b39c657f56e648dc9ac5619fe56ee4f1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
| |
Fixes: QTBUG-111091
Change-Id: Ia9c2503d4304f9d8223151f9fc07f94cf8855527
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
| |
Change-Id: I36edd7325be1f5b58134a56982140db7395862c4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Move the important block up, so that people notice in the first time
they read the docs. Add a sentence to describe the point of enclosing
arguments in curly braces.
Fixes: QTBUG-109734
Pick-to: 6.5
Change-Id: I245ff686a43c6fd443afdf98a28cd9564e492ed7
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Whereas the palette resolve mask in Qt 5 had one bit for all 3 colors
of a role, the mask is now a 64bit value with one bit for each
combination of role/group. Introduce helper functions (copied from
the QPalette source) to get the correct mask bits for each role/group
and for all groups of a role.
In the multiselection property helpers, check each role/group.
In the palette editor, use row masks to clear rows.
Pick-to: 6.5 6.4
Task-number: QTBUG-110963
Change-Id: I089a75d03828ff894527601fc111d5e39183e695
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-110447
Pick-to: 6.5
Change-Id: If00868910d64168d4f5d7280945985490984762c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-110447
Pick-to: 6.5
Change-Id: Ia9c06560f15dfee58a8a441c3791785827b70913
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Use new string literals
- Reorder includes
- Use some auto
- Minor fixes
Amends d1e672c47fd9cfa60f646554db6cba9de08a044f.
Pick-to: 6.5 6.4
Fixes: QTBUG-110447
Change-Id: I22c2ee4f2770e2656a6ffad0823ec59f7cf3df23
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Deleting the global menu bar deletes the window menu, which
causes a crash when form windows are removed later on.
Amends 78d807bc05590cd785e485fe1d2b07e86ca9bf79.
Pick-to: 6.5
Change-Id: I0789d77323d7c205163bbeb416452d31631c70d9
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Allows to have text in extra comment within quotes that will be kept
intact when running lupdate.
Fixes: QTBUG-110630
Co-authored-by: Kai Köhne <kai.koehne@qt.io>
Change-Id: I267e779193f168a8af067b927735991f2c512145
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
[ChangeLog][Third-Party Code] Litehtml (used in Qt Assistant) was
updated to upstream version v0.6.
Fixes: QTBUG-110353
Pick-to: 6.5
Change-Id: Ib67936cd4493ff84d247fa241a1cc4ef641cf752
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Remove duplicated identical pictures and replace
taskmenuextension-example-faded.png by a normal screenshot
since it is hard to maintain.
Task-number: QTBUG-110447
Pick-to: 6.5
Change-Id: Iba7ee91dee8fb63af40c1c9b4163d573a1deae5f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QDoc uses clang's C API, LibClang, to parse the source code of C++
projects, so as to be able to extract the user-written documentation and
provide certain guarantees about its correctness.
When QDoc encounters a function, method or similar element, it extracts
the types of the parameters of the element, both to show them to the
user and to compare them to the one provided by the user in a certain
document-block, to ensure consistency.
LibClang has a good support for those kind of extraction, such that they
are used to perform this effort in `ClangCodeParser::processFunction`,
the method that generally execute this process to enrich a
`FunctionNode`, the internal representation for documentable elements
that are callable, with the relevant information.
Recent changes to QDoc allows us to interleave usages of Clang's C and
C++ API, something that was done for certain parts of
`ClangCodeParser::processFunction` that could not be easily represented
with the more limited LibClang.
While there is no particular issue with the interleaving of the two
APIs, the two axis on which information is retrieved tend to require
certain overlapping operations, which lengthen the code and tend to not
mesh well with one another.
Thus, we refactor a further part of `ClangCodeParser::processFunction`,
to slowly convert it completely to a Clang's C++ API based method.
Hence, the code that takes care of extracting information about the
type of the parameters of a callable element was rewritten using the
equivalent Clang's C++ API calls.
Change-Id: I365cd1257b2a6a07187dbf23a971244b4c1f2daf
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously QDoc provided a \generatelist example[files|images] <regexp>
feature to list example files matching a specific regular expression,
but it was left non-functional after changes to example documentation
generation.
Remove remnants of the related code paths and documentation.
Pick-to: 6.5
Change-Id: Ibdaab6e6be3e4d87b60fa59966783827f0a264e1
Reviewed-by: Luca Di Sera <luca.disera@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Let Config::[push|pop]WorkingDir() manage the working directory
in addition to storing it, remove the unused return value from the
latter, and add a Q_ASSERT to guard against popping an empty stack.
Pick-to: 6.5
Change-Id: I4983658f9d21eebaeb447b507694b0da1145e48c
Reviewed-by: Luca Di Sera <luca.disera@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QDoc had a naive strategy for parsing Q_PROPERTY() macro arguments for
resolving the type and name; when the argument string is separated by
spaces, the first item was assumed to be the type, and the second item
the name. This failed for following valid declarations:
Q_PROPERTY(QMap<QString, QString> map ...) // type contains a space
Q_PROPERTY(Type * handle ...) // '*' interpreted as the name
Fix this by locating the first property attribute and then splitting
the input at that boundary. This allows QDoc to extract the property
type and name without making any assumptions about their syntax.
Remove old workarounds as unnecessary and implement safeguards for
invalid input. Also handle the MEMBER attribute correctly as it
implies the property is writable, whether the WRITE accessor is set
or not.
Pick-to: 6.2 6.4 6.5
Fixes: QTBUG-111093
Change-Id: Ic1bf071a7b003a1cd0cb9a212dabdb7ea00ebfbe
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Luca Di Sera <luca.disera@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
In the scope of QTBUG-106644 QLocale::system() is now included in the
list of matching locales, it is no longer needed to add it to the list
manually.
Fixes: QTBUG-106644
Change-Id: I1eff7851a26aadc3968c18ec1b1eaf26feabd847
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|
|
|
|
| |
Change-Id: If6a7f80a4a24080e8399e792ca157eb281e0fe2e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Complements 0f092219165ecd5751ef73cb939364134a0319ee.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I098f2d42bbc367cee89284fb6fb2d2c7cfc5c54d
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
It causes clashes in CMake Unity (Jumbo) builds.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: Ia7aa2428f93f5ff07fea7e77e93df91cd0a75f4e
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
Reviewed-by: Luca Di Sera <luca.disera@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
It illustrates how to use multipleinheritance from Ui struct and widget
and is not really related to UiTools.
Task-number: QTBUG-110447
Pick-to: 6.5
Change-Id: If6b61c76ea0ac07b935f1e0a8ee02a2e7179cdc3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|
|
|
|
| |
Change-Id: If596f8677bbebba160e740dfcc24bba064dcb85f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
|
|
|
|
|
| |
Pick-to: 6.5
Change-Id: Ic00df7d45246270d724b3b1d1ef9d13d76dcc136
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
The functionality is sufficiently demonstrated by the existing custom
widget plugin examples.
Task-number: QTBUG-110447
Pick-to: 6.5
Change-Id: I09198bba46ebe8da03c9e21192588e6010bec541
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The signature changed again.
I've tested it with a current main, that is clang 17, but the commit
854c10f8d185286d941307e1033eb492e085c203 with introduced the change is
also contained in clang 16.
Pick-to: 6.4 6.5
Change-Id: I050ca5843708be4489757538849000d3675005ac
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
|
|
|
|
|
|
|
| |
Pick-to: 6.5 6.4
Task-number: QTBUG-110963
Change-Id: I212f15dca35a93b02786567a2b8e1412eff48e90
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Whereas the palette resolve mask in Qt 5 had one bit for all 3 colors
of a role, the mask is now a 64bit value with one bit for each
combination of role/group. Port away from checking for the bits
where this is easily possible.
Pick-to: 6.5 6.4 6.2
Task-number: QTBUG-110963
Change-Id: Ib6d3d44deb549bd3a49937eaef3385414480f8d3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
The QPalette resolve mask type has been changed to 64bit.
Adapt the code accordingly.
Pick-to: 6.5 6.4
Task-number: QTBUG-110963
Change-Id: I9d1a2f20c7b671a0ef1a9182ccb2f8c964b231ab
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
The QPalette resolve mask type has been changed to 64bit.
Make it a template so that it works correctly.
Pick-to: 6.5 6.4 6.2
Task-number: QTBUG-110963
Change-Id: I61394c58155bdc37a98dac0c763e6a7d9fbbfe84
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|
|
|
|
|
|
|
|
| |
Previous changes left inconsistent indentation in example code
snippets.
Pick-to: 6.5
Change-Id: I86e116455e22b513fbfdbacc65ac7e05b01b4c56
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The QDoc manual has a lot of code snippets demonstrating the use of
commands, and these comments include the C-style comment delimiters,
/*! and */. However, because */ is forbidden to appear within a comment
block (as it terminates it), the snippets included malformed versions
of the delimiters. This made copy-pasting annoying as the snippets
didn't represent valid QDoc syntax.
Fix the issue by using a '*' argument passed to code quoting commands,
allowing /\1! and \1/ to expand to the actual delimiters in the output.
Also,
* Replace the use of \code with \badcode for QDoc snippets, avoiding
the needless parsing/highlighting of non-C++ code.
* Fix other minor issues in passing.
Pick-to: 6.5
Fixes: QTBUG-110142
Change-Id: Idcc4dc0fdfc6a8c7d368f3b2bc8f0dd8f1eb0843
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
By default, QDoc printed progress information such as
qt.qdoc: Start/Stop qdoc for <project> in <mode>
qt.qdoc: Parse source files for <project>
These do not provide much useful information, so hide them under the
--log-progress command line option. --debug now also implies
--log-progress.
Remove all uses of leftover debug statements that used qDebug(), or
where suitable, convert them to use logging category with qCDebug()
and friends.
Remove unused function FunctionNode::debug().
Clean up formatting and language for some of QDoc's output messages
in passing.
Fixes: QTBUG-110923
Pick-to: 6.5
Change-Id: I2cab456b0e144249e4234a253fd1c90d76666132
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
For some reason, they cannot be installed into sysroot,
Complements 81fdb4dee5083a59dbdb2d01fcb6ab13285be26b.
Fixes: QTBUG-110930
Pick-to: 6.5 6.4
Change-Id: Ia6f4d123f7435a1388bb3cfef38daa48120b4891
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
| |
Pick-to: 6.5 6.4 6.2
Task-number: QTBUG-110447
Change-Id: I8ec8a023d8efc76a7123c56eded528ea31294af0
Reviewed-by: Jaishree Vyas <jaishree.vyas@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|
|
|
|
|
|
|
|
| |
Detected by Valgrind Memory Analyzer.
Pick-to: 6.5
Change-Id: I09985f231b7cad16b7234a8ecc675cb55a411794
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It looks like in Docked Window mode the main menu bar
is parentless (on platforms other than Q_OS_MACOS), while
in Multiple Top-Level Windows mode it has a parent.
In first case the menu bar was leaked, while in the second
one it was deleted by parent before running QDesignerWorkbench d'tor.
The fix is to keep a QPointer to menu bar instead of raw pointer
and delete it always from QDesignerWorkbench d'tor. When the
menu bar was already deleted, the QPointer to menu bar is cleared and
delete m_globalMenuBar() is no-op.
Detected by Valgrind Memory Analyzer.
Pick-to: 6.5
Change-Id: I0b3a77ec350a52e4b1eda532dd2a98236ec57bd6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
QAction::setMenu() doesn't take ownership of the passed menu.
Detected by Valgrind Memory Analyzer.
Pick-to: 6.5
Change-Id: I31539f977afe19f7e9a3d61302998bea4e354ff7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
| |
Pick-to: 6.5
Task-number: PYSIDE-2191
Change-Id: I0fd32910350188afb7e14a1cf51456d91ff760fc
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Remove the misleading doc_src_qtdesigner.pro which wrongly sets
the CONFIG qmake and use the standard qdoc macros to generate the
correct information.
Add dependency to qtcmake to make linking to CMake manual work,
and fix the sourcedirs qdocconf variable not to override settings
from the documentation template.
Pick-to: 6.5 6.4 6.2
Task-number: QTBUG-110447
Change-Id: I68f2fa2bed420fd2cef2fe780521d70d729fdd62
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
|
|
|
|
|
|
|
| |
Detected by Valgrind Memory Analyzer.
Pick-to: 6.5
Change-Id: Ic3fe129eaabed8e82f594241cac14f9661147ddf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When QtResourceEditorDialog destructor is being run, the following
happens in exactly this order:
1. Explicit QtResourceEditorDialog d'tor is being run.
2. Scoped d_ptr of QtResourceEditorDialogPrivate goes out of scope,
so d'tor of d_ptr is being run
3. Children of QtResourceEditorDialog are being deleted
4. One child of QtResourceEditorDialog was a QtQrcManager, and its
d'tor is sending signals. This signals are still connected to
QtResourceEditorDialog and respective lambda slots are called
causing crash since all lambdas refer to d_ptr that was already
deleted.
The fix is to disconnect from QtQrcManager signals in d'tor
so that it prevents calling lambdas referring to d_ptr.
The regression went in when replacing private slots with lambdas.
Apparently, when having private slots, the connections were
broken on destruction of d_ptr, while with lambdas it's not the
case anymore.
Amends 3dcf1490cb2bce34cb1f7777dfe836310f305817
Pick-to: 6.5
Fixes: QTBUG-110881
Change-Id: If42d0014d8bff9aae09439fcc453dd2c1e287ae6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
| |
Pick-to: 6.5 6.4
Task-number: QTBUG-110447
Change-Id: I36769acc50921c2e6af33288b8e291b56328ddc7
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
|