summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into ↵v5.15.13-lts-lgplTarja Sundqvist2024-01-0478-1606/+535
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I1ce33b40544c89ee67348ae9fc8a04b657cfecd8
| * HelpEngineWrapper: fix API susceptible to GCC 13 -Wdangling-referenceMarc Mutz2023-01-262-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC 13 currently assumes that the temporary argument (the default value) ends up embedded in the result, and warns: helpviewer.cpp:393:34: error: possibly dangling reference to a temporary [-Werror=dangling-reference] 393 | const HelpEngineWrapper &helpEngine = HelpEngineWrapper::instance(); | ^~~~~~~~~~ helpviewer.cpp:393:74: note: the temporary was destroyed at the end of the full expression ‘Qt6::HelpEngineWrapper::instance(Qt6::QString())’ 393 | const HelpEngineWrapper &helpEngine = HelpEngineWrapper::instance(); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~ An attempt to fix the issue by passing the QString by value made it worse, as all calls threw the warning then, including those that pass a QString instead of relying on the defaulted argument. So, heed QTBUG-98117 and overload instead of using default arguments. Having the nullary overload in the same TU as the unary one seems to make GCC shut up about the False Positive dangling. Task-number: QTBUG-98117 Change-Id: I69da70dfbf996ab923078631031f6f3c7a5cfcbe Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 14fe0bbea5b04dff01495e815b33a0a1dd2e191a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * QLayoutSupport: fix GCC 13 -Werror=overloaded-virtualMarc Mutz2023-01-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Says GCC 13: layoutdecoration.h:52:17: error: ‘virtual int Qt6::QDesignerLayoutDecorationExtension::findItemAt(int, int) const’ was hidden [-Werror=overloaded-virtual=] 52 | virtual int findItemAt(int row, int column) const = 0; // atm only for grid. | ^~~~~~~~~~ qlayout_widget_p.h:178:16: note: by ‘Qt6::qdesigner_internal::QLayoutSupport::findItemAt’ 178 | static int findItemAt(QGridLayout *, int row, int column); | ^~~~~~~~~~ Fix by adding the missing using declaration that brings QDesignerLayoutDecorationExtension::findItemAt(int, int) into scope again. Change-Id: I69b3033fa2da30388f87229cd2ab26822bab0d16 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 345d33893e15124a795a39a4a8614286cbf7faf9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * qtattributionsscanner: Fix QTextStream/QFile construction orderTopi Reinio2023-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Local objects are destroyed in the order reverse to their construction; the destructor of QTextStream attempts to flush an already-destroyed QFile object. Flip the order of their construction. Fixes: QTBUG-109618 Change-Id: I10d468289aee82159ffe6f292522e91752aabb3b Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit f645125b0bc95c572d1f52957ee7ec70e88ac42c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * QDoc: Remove unused overload of \meta commandPaul Wicking2022-12-307-111/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At some point, special processing of meta content was added to make QDoc generate an entry of maintainer(s) in output. However, this hasn't seen use in the docs going back as far as _at least_ Qt 4.8. Remove this overload of the \meta command as it is unused, and adjust the relevant documentation in the QDoc manual. Fixes: QTBUG-109724 Change-Id: I9890a831f0c950c122eced62e2e1b184bda23b0b Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit db435620ab5d5420d1b59f96f413425a15c3b142) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * Bump version to 5.15.13Tarja Sundqvist2022-12-221-1/+1
| | | | | | | | | | Change-Id: Ie31fb101125e458ea218161db8189b3b43c13698 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * qdoc: Append translate attribute to few more blocksVenugopal Shivashankar2022-12-1539-284/+284
| | | | | | | | | | | | | | | | | | | | | | | | | | - Auto links - Qml property summary and method signature - Anchors - See also entries - All C++ classes and QML types list Task-number: QTBUG-106679 Change-Id: Ib7046321ccac16bf1141885a5cf2d411084f57ab Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit b7849d42efff91a4d247a4028d6c129f3742743a)
| * qdoc: Add translate attribute to HTML blocksVenugopal Shivashankar2022-12-1462-1301/+330
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A browser translates everything by default, which means even the <code>, <pre>, <table>s listing the class members, and so on, are also translated. With this change, such HTML blocks will include the "translate=no" attribute, indicating that they should not be translated. Fixes: QTBUG-106679 Done-with: Topi Reinio <topi.reinio@qt.io> Change-Id: I446fe26c73b9e3fee2984297bd504ae72c555e73 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit b7849d42efff91a4d247a4028d6c129f3742743a)
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.12' into ↵v5.15.12-lts-lgplTarja Sundqvist2023-10-111-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I290cf7692ce005d2b83e4d4c3aaf5437b56ceb15
| * Bump version to 5.15.12Tarja Sundqvist2022-10-061-1/+1
| | | | | | | | Change-Id: I1d85f261e341117719593e9d970c7d7c38c18d56
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵v5.15.11-lts-lgplTarja Sundqvist2023-06-0918-37/+153
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I81c96075286f4e5d944c15b26d24a9c3630286b2
| * qtattributionsscanner: Support multiple license filesKai Koehne2022-09-0212-33/+126
| | | | | | | | | | | | | | | | | | | | | | Accept a new LicenseFiles array that allows to list multiple license files. This avoids the need to artificially concatenate licenses in one file. Change-Id: Ia9db77b3bc0ea7fc6072d0296da5ea3cfce44b59 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit db87f5b27ce02e51b0e38aaa8473a40b0d87094a) Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * macdeployqt: Ignore repeated references to binary when parsing otool -LTor Arne Vestbø2022-08-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macdeployqt doesn't know or care about universal build (yet), and will just scan all the lines produced by otool -L as if they were for a single architecture, ignoring any lines it doesn't recognize. This fails when the second arch starts off with a reference to the binary we're processing, which then gets interpreted as a dependency of itself. If that binary doesn't have a path, we end up looking for a match in /usr/lib, which we can't find in the best case, or actually end up deploying from an incompatible Qt version in the worst case. Ideally we'd teach macdeployqt about the multiple slices, bur for now we work around it by skipping any references to dependent libraries that match the binary itself. Fixes: QTBUG-102607 Change-Id: Ia039fafdce90896e61aab90b9c8ac52543cc2c8c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit 12fb2cfa11cb2e0b7deb00025b0f2c6a91519d98) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| * Build QtDesigner plugins in all configurationsJoerg Bornemann2022-08-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | The QtDesigner plugins were marked as 'tool_plugin', which restricts their build to release-only, even in debug_and_release builds. This was done to avoid building debug plugins for tools that are only build as release. However, the designer plugins are also loaded when using QUiLoader and thus are not exclusively meant for the designer tool. Task-number: QTBUG-104755 Change-Id: I82404d964b468ada803e575bf24d79a5f8922c1f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * lupdate: Allow multiple specifiers after method signatureJoerg Bornemann2022-07-153-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...in the old C++ parser. Out of line method definitions with multiple specifiers resulted in an lupdate warning. Example: class MyClass { Q_OBJECT QString text() const noexcept; } QString MyClass::text() const noexcept { return tr("foo"); } The reason was that we discarded the prospective context ("MyClass") after encountering two consecutive identifier tokens (const noexcept). Presumably, this was done to discard the context in the case of return types such as in: std::string myFunc() { return tr("foo").toStdString(); } The code discards the prospective context "std" upon encountering "myFunc". However, this is such an edge case, given that it's unlikely that people have a global tr function defined, we can happily allow this wrongness in favor of fixing the frequent occurrence of multiple specifiers after a parameter list. [ChangeLog][lupdate] lupdate does not trip anymore over tr() calls in methods with multiple specifiers. For example "QString MyClass::foo() const noexcept" now gets the correct context. Fixes: QTBUG-99415 Change-Id: I54afb96270fae1651dcf19fb9c479fa4cba3ede8 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit afbc20ed01e187c1af6ae55f6a9a3a512b183f1c)
| * Bump versionTarja Sundqvist2022-06-151-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into ↵v5.15.10-lts-lgplTarja Sundqvist2023-04-247-56/+50
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I630285e7081453aef1948129efd7c368df513ef8
| * qdoc: Do not split module names in different tagsKai Köhne2022-05-121-9/+5
| | | | | | | | | | | | | | | | | | | | This did more harm than good, e.g. for ActiveQt->active,qt QtWebView->web,view. Change-Id: Ia08bc12ef7496fccb1a5d9bbd45c285448417adb Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 255b9699f6957282200546705ad493ab16631883) Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * qdoc: Do not generate tags from titles anymoreKai Köhne2022-05-123-28/+3
| | | | | | | | | | | | | | | | | | | | | | | | Qt Creator nowadays searches itself for matches in the title and description, so no point in automatically generating tags from titles anymore. Change-Id: I4aa9912f7bb6dd293b5de8ebff7e751956e6856d Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit f3c96dc9fd0dce00df7ae60f9a1c4ba86eaa2d70) Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Skip endonym in linguist settings list when not availableEdward Welbourne2022-05-031-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The settings dialog iterates all members of the QLocale::Language enum, producing an entry for each. It tried to add the endonym of each language to its entry; however, QLocale(language) gets the default locale if there is no CLDR data for the given language; and the default locale's endonym is no use to us. So don't attempt to include the endonym of a language unless the locale from which we get it actually does use the requested language. Also mention why English skips its endonym. Fixes: QTBUG-102832 Change-Id: Ia4583727beb247e4775f443d98089db3f02a17d2 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit b30768f7714141158b4fa7afd3ae2ad5ca68dceb) Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * lrelease-pro: Take EXTRA_TRANSLATIONS into accountJoerg Bornemann2022-04-282-9/+30
| | | | | | | | | | | | | | | | | | | | | | | | The QMake variable EXTRA_TRANSLATIONS contains .ts files that are only to be handled by lrelease but not lupdate. Teach lrelease-pro to understand this variable, but ignore it in lupdate-pro. Fixes: QTBUG-101782 Change-Id: I79e1c669480dc35dc61ecc149fe7ba1bba28ab29 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 2641698341456b8905ef1fbd58b51a80a61ef70d) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * Bump versionTarja Sundqvist2022-04-061-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgplTarja Sundqvist2023-03-2314-23/+54
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I2813471aad9bc8b9bd04efe8571be6d1bee3045c
| * qdoc: Fix assert on empty link targetTopi Reinio2022-03-153-2/+13
| | | | | | | | | | | | | | Fixes: QTBUG-97562 Change-Id: I9e2b2b3979f9c0ca22f23a1a5fef5296b2a34a00 Done-with: Luca Di Sera <luca.disera@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * macdeployqt: don’t err on unexpected otool outputTor Arne Vestbø2022-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binaries with multiple slices (e.g. arm64, x86_64) will have an extra line for the slice, like: “/path/to/QtGui.framework/QtGui (architecture arm64)” The parsing code will skip this line since it does not match the regexp. In other words the parsing works by looking for lines which matches, and finding lines which don’t match is not an error condition. Task-number: QTBUG-98466 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry-picked from commit 4184a127fa08c3ffafad863f6dde5d4bdc349bf1) Change-Id: Ifc2a37f867b724b9773c578fc2ad018959842482 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| * Don't run qdoc tests if qdoc was not enabled during configureTor Arne Vestbø2022-02-251-0/+4
| | | | | | | | | | Change-Id: I2dd4998811769cc8df3b190cc411390e5a2557d6 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * CMake: Fix qt_create_translation to not remove .ts files on "clean"Joerg Bornemann2022-02-171-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running "make clean", .ts files were deleted. This must not happen, because .ts files are source files. Remove the .ts file from the OUTPUT of the custom command that updates the .ts file. Add a timestamp file instead that is touched upon updating the .ts file. In qt_add_translation we must depend on this timestamp file. If users call qt_add_translation, we don't depend on a timestamp file but directly on the .ts file like before. Fixes: QTBUG-96549 Change-Id: If93a6d1b47a33b29dc92fb987da2afcf8d29e895 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 153db2fedc5935d858d3adeb283ced5e4de5babf)
| * lupdate: Support numeric literal separatorsJoerg Bornemann2022-01-192-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Numeric literals that use apostrophes were introduced in C++14 so this adds support for cases like: int d = 10'000'00; int x = 0xAF'FE; This patch allows just any number and combination of apostrophes in numeric literals and doesn't attempt to detect ill-formed literals. We assume, lupdate runs on code that has been accepted by a C++ compiler. Task-number: QTBUG-53326 Change-Id: I23bd9b4c676694dc69199e4a17a612a011449e61 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit c2d1163004078b98abc86318f45a6796aef18811) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * designer: Fix MSVC warning about returning address of local variable or ↵Kai Köhne2022-01-051-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | temporary std::reverse_iterator::operator*() returns by reference while QKeyValueIterator::operator*() returns by value, so MSVC is correct when it warns about returning the address of a local variable or temporary in (*itStop).second: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.30.30705\include\xutility(1582) : error C2220: the following warning is treated as an error C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.30.30705\include\xutility(1582) : warning C4172: returning address of local variable or temporary Avoid this by just iterating backwards. Amends 6ed8a22dd2756557954dc85052870c0894de06ba. Change-Id: I01ce7cb151efa61e8702686b3a463790869df72c Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> (cherry picked from commit a9084297f629423c64d571d7f7286d3c0e239247) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump copyright year to 2022Kai Köhne2022-01-054-4/+4
| | | | | | | | | | | | | | Change-Id: I1b3f0d1b84f507e45728a00fa652d0db936cebca Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit bd8827cd95552372a5aca78a21210a46bddadc36) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionTarja Sundqvist2021-12-311-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-108-26/+36
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I49622bd49ad2570121543819ad4d8d1e249dcbcd
| * Bump versionTarja Sundqvist2021-11-081-1/+1
| |
| * qdoc: Add styling for \note, \important and \warningTopi Reinio2021-11-086-24/+34
| | | | | | | | | | | | | | | | | | | | And add Atom types for Warning instead of simply hard-coding a bold warning note. Fixes: QTBUG-97448 Change-Id: I1fe691ffaadc549b17c8628817fe761d3be0fad7 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 8687e163757df00c1e64c15ad63680ed5c2f6937)
| * macdeployqt: don’t stop qmlimportscanner after 30sMorten Johan Sørvig2021-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Process::waitForFinished() has a default timeout of 30 seconds, but qmlimportscanner can in some cases run for longer than that. Fixes: QTBUG-97104 Change-Id: Ie40d052ad6a4dc8643860163eb9a0c8f5859c3ae Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit 2e1cca4bb6051067c031c4b9b248b99acd63369a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵v5.15.7-lts-lgplTarja Sundqvist2022-09-1217-30/+83
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I926253124b93a75804047a391069f943fdca3a0f
| * qdoc: Fix warnings about \generatelist argumentsKai Köhne2021-09-241-3/+3
| | | | | | | | | | | | | | | | | | | | QString uses %1 as a replacement marker, not \1. Fixes: QTBUG-96837 Change-Id: Ib27fd6493eb81a0a4e11dbb1c01832282a78879c Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit a583d490d64e3e9fe96d6770115106988d87fa47) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * qdoc: Fix Section::reduce() omitting sections with obsolete membersTopi Reinio2021-09-1311-2/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | This caused documentation for obsolete members to go missing if a section had only obsolete members. This commit backports 19002292a73d502da9ab4da168b8509cda1d6908 to 5.15/lts. Fixes: QTBUG-96369 Change-Id: I3104bba23cfc4ba831fd8405c851ef56347e4f3f Reviewed-by: Luca Di Sera <luca.disera@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * macdeployqt: detect debug libs by using “_debug” suffixMorten Johan Sørvig2021-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use endsWith() instead of contains(), which will not give a false positive for internal usages of the “_debug” string in the library name. Task-number: QTBUG-90982 Change-Id: I22258ab2cc59e36d13fcdc078fcb2ad6381de102 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit ac79993e7f0f4cca37aac113ebddfedc470e7153) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: I415ce13aa0d04479a54d73cadb983bc983cf023d
| * Fix extensions without leading period having first character droppedCraig Scott2021-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The list(TRANSFORM ... REPLACE) regular expression was malformed. CMake string parsing requires backslashes to be escaped if they need to be preserved instead of treating them as escaping the character that follows them. Fixes: QTBUG-96220 Change-Id: I61d46cfb7ed32fd97c49e15a1f58a055f12e596f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 581fc31c54aaa06af16c2047808a29be1a8d3239)
| * Doc: Remove mention of custom filters, part 2Kai Köhne2021-08-252-22/+0
| | | | | | | | | | | | | | | | | | | | Amends 235bbe3f939ce4b44b844ec67389c8a71ceceea5 Task-number: QTBUG-91082 Change-Id: Iade5289503d2c17e849eca1dfe2641aac70d8cfd Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit fff99c6e97a094f2fed0a4fa56d3d74800e9c85c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-168-58/+50
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I47940f0d599b23a8d3e1fc1a0735540170c0d0c3
| * windeployqt: Account for debug version of ICU library when deployingAndy Shaw2021-08-061-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | If windeployqt is deploying the debug version of the libraries and the used ICU package contains debug versions of ICU libraries then the debug version of icudt should be included as well. Fixes: QTBUG-87677 Change-Id: I43266f9d65feacfd22c26de1008976bda001b481 Reviewed-by: André de la Rocha <andre.rocha@qt.io> (cherry picked from commit 8c6f62b9c26f6fb42fff185e702d365ab18bd1c5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Doc: Fix a typo in the "Introduction to QDoc" documentation pageLuca Di Sera2021-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | Changes `thinks` to `links` in the 4th paragraph of the "Why Standard Mode Is Slow" section. Fixes: QTBUG-95561 Change-Id: If49f2d58341f33adf8cb8504193d7e3cb3896fcc Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 07164bb6a5bdea6cacd69692287bd65a592b2f5a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Doc: Remove mention of custom filtersPaul Wicking2021-06-241-40/+6
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-91082 Change-Id: I5610667072b618d8d0597e618f872266e4397536 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 235bbe3f939ce4b44b844ec67389c8a71ceceea5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Examples: Don't use QDir::separator() in internal pathsKai Köhne2021-06-213-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | Documentation says: You do not need to use this function to build file paths. If you always use "/", Qt will translate your paths to conform to the underlying operating system. Change-Id: Iba62a197821b9abc819c3d333e44c9f1ed989898 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 8329ec476b3dc9bb7ffd17ee724b6b21c17e90ec)
| * Assistant: Make QResultWidget linkColor stylableFriedemann Kleint2021-06-141-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a property "linkColor" of QColor type to the QResultWidget class. Now it's possible to style the link color in search result widget through the following stylesheet: QResultWidget { qproperty-linkColor: red; } Fixes: QTBUG-74353 Change-Id: Ife57b5a64154be83f6eab4ef533840c51aefd1f5 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Bump versionTarja Sundqvist2021-06-071-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-05-1916-36/+162
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ic4320871845328c7fdb0168bb27e981ea31dcb27
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 11:40:05 +0000