summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Clear out deprecated QLocale::Language valuesv5.15.25.15.2Edward Welbourne2020-11-051-6/+2
| | | | | | | | | | | | | CLDR provides no Bihari locale data, so we're retiring it. Tagalog is now called Filipino. Various aliases mentioned in comments are going away. Task-number: QTBUG-88167 Change-Id: Ie31353911be2de908f53e9b84d6b819677ad946b Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 7268647fd5f911303a507fd5cc7c3feb48bb253f) Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Add changes file for Qt 5.15.2Antti Kokko2020-10-301-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | - 67dd99b072fb96359f077e766067c0f218a64eba qdoc: Fix incorrect loop when processing tagged \fn parameters - 13c294c3bd61810ea7040691894e2c38f6f096ae Add changes file for Qt 5.15.1 + 2d557b1c5c4d2da8d307519835a0b97287891a9c winrtrunner: Remove Windows Phone support + 61c794846f3db82a10e5505397adb1b19bd21076 Use operator| to compose key sequences + 2cea79cfbb237c1f4bdc10619a1ddbdc5c49b39b qtattributionsscanner: Linkify dejacode URN's for LicenseId + a8708a3ee64dbf46a83ef572620758c26e2fc0de Qt Designer: Fix build of the QPrinter-related code + 97f4de3866cbf389ebc318c5b7fa923b28ffbe53 QDoc: Upgrade building with Clang 10 + c73abc317a7970740aabfb5a11b0af3970a577e0 Fix static build of assistant + 3c9315592180e8ae0404bccd4a843bac977c589c Assistant: fix build with QT_NO_CLIPBOARD + 0aad0fa07bfc27c71df27ab433916166b87148b7 Assistant: Use new config system for cursor + 0833db3f366eb59f08d4497dc424dd46b08da7ae QtHelp: Fix documentsFor() when not using filter engine + 5cd1c07e5d88c3c8521c1af45d47b519d6e1faba Designer: Fix a crash on startup when built without clipboard + f3180b6eb650598ca937943d6cd66da13335d9de Revert "macdeployqt: Don't copy .prl files into the Resources folder" + 79aff793613f031b5757c3e1e6f176436c4a532f Bump version + fe43e6779ea1a6f64869fedc0a0880e89e01bfaa qdoc: DocBook generator: Remove code for encoding special characters + ffedf9cf7e6c52d8b59af47b21e7a29ee23720ec qdoc: DocBook generator: Correctly handle enum classes + 72b5a4dcae9e9be4a6d66884d3cc0bfb2d692477 qdoc: Fix broken links generated by \sincelist + 4aa4e4f727233d8b620b2d591311c90cb8bed39b Add macdeployqt autotest Pick-to: dev 5.15 Change-Id: I336f58e71b941f821a2070a885013b5fbea33e68 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Add macdeployqt autotestMorten Johan Sørvig2020-10-265-2/+342
| | | | | | | | | | | | Add testing framework and test that builds, deploys, and verifies deployment of simple and complex app bundles. Based on the windeployqt autotest. Change-Id: If02321daa77bde3a787372656a5816df78f4b13e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit e0c08b3bfd0d0a92a8d60991260ee377357fa94e)
* qdoc: Fix broken links generated by \sincelistTopi Reinio2020-10-231-5/+5
| | | | | | | | | | | | | | | | | The combination of single-exec mode and outputting to subdirectories (offline mode) made \sincelist generate href's to new classes and functions that are missing the target subdirectory. This happened because we did not pass the relative node to the function(s) that generate that list - proper link resolution requires a check if the page containing the \sincelist command comes from a different doc module, and the relative node is used for that. Fixes: QTBUG-87802 Change-Id: I30024d651a857b15375ef7e35dfaa21f0193ec46 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 15ebf3327191335c2c6eac4114ccb0553dc34f63)
* qdoc: DocBook generator: Correctly handle enum classesTopi Reinio2020-09-284-7/+270
| | | | | | | | | | | While commit 46f71fcc fixed handling of enum classes for the code parser and marker, the DocBook generator has some dedicated code that also needs to be amended. Fixes: QTBUG-84703 Change-Id: Idea969e4baeb5adc0071e842733104758a70b703 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit a6ab3c81f038f7bc2d32c9c613ba195758d0b011)
* qdoc: DocBook generator: Remove code for encoding special charactersTopi Reinio2020-09-281-22/+1
| | | | | | | | | QXmlStreamWriter already handles this for us. Fixes: QTBUG-86988 Change-Id: I6aafbf880e79fc4e0a7600f272ae298929577da8 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 89fccddc379dd009327cb4118f786040685b1b63)
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: I1ee444f1b1557994bac5759968676889110e39e9
* Revert "macdeployqt: Don't copy .prl files into the Resources folder"Morten Johan Sørvig2020-09-221-8/+2
| | | | | | | | | | | | | This was skipping other files from Resources/ as well, such as “en-GB.pak” and “QtWebEngineProcess”. This reverts commit aabba72f7965e06e2e6ed960d8cf8078249dac8c. Fixes: QTBUG-86759 Change-Id: I6d27e3a32b479e1b6765783af71dd16826b181ca Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit 2727412238300d847493351e706f01d180c64d70) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Designer: Fix a crash on startup when built without clipboardJarek Kobus2020-09-164-4/+20
| | | | | | | Change-Id: I4559c14316d63325554466c710ef0d8017e5876f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit b5da5f522616f99b000ed1c64a5cc1de0c3f8937) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QtHelp: Fix documentsFor() when not using filter engineJarek Kobus2020-09-163-11/+48
| | | | | | | | Fixes: QTBUG-84727 Change-Id: Id66cc071a24cc761dc63d044b7f74d0e1959cd22 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit dbe178044b591490cb98c071da8b91342129e030)
* Assistant: Use new config system for cursorJarek Kobus2020-09-151-4/+4
| | | | | | | Change-Id: I528a4d5f2bcefc42cdec08d6742936ccdbc4ae84 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit db8e1b5d926cce2eba2d558eca9535e43ba32957) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Assistant: fix build with QT_NO_CLIPBOARDJarek Kobus2020-09-159-19/+49
| | | | | | | | Fixes: QTBUG-86598 Change-Id: I02348fc3b3b8e842a2aaaac6f98078f86ba2a767 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 979f7fe10b2c2a921efa483afe887c7d17297fc7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix static build of assistantJarek Kobus2020-09-141-1/+1
| | | | | | | | Fixes: QTBUG-86477 Change-Id: Ifb77fb38b4b182a996666c6b69d8357458add0c4 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 6db2b442dd14eb068bba52e4f7223139ea29a558) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDoc: Upgrade building with Clang 10Cristian Adam2020-09-111-197/+88
| | | | | | | | | | | | | | | | | Clang 10 will allow the same way of building qdoc against a static or a dynamic build of clang. Qt will have prebuild packages of both, but not in one package, but instead of two. Due to Windows platform one cannot have both static and dynamic builds of clang. Change-Id: I9c6ecc9886263d797a5523063dafd223d8cb7585 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit d9dc6dddb49439900695a5000e6ad19c935a535e) Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Qt Designer: Fix build of the QPrinter-related codeFriedemann Kleint2020-09-091-1/+3
| | | | | | | | | Adapt to qtbase/00a5629d8de18bc1a5dfb6e2526c03b4b021c903. Change-Id: I60d087effa61b09c7907d6168f8fa710462913c3 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 87b3a255d3ede3d8aef7fc1ebdbb30b2bff2463f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qtattributionsscanner: Linkify dejacode URN's for LicenseIdKai Koehne2020-09-071-2/+6
| | | | | | | | | | | | | | | | | | So far we only allowed SPDX license ID's. Anyhow, there are some licenses not represented in SPDX, but in the much vaster DejaCode database. This is the case e.g. for the Bitstream Vera Font License, which is tracked in Qt Gui and currently leads to a 404: https://doc.qt.io/qt-5.15/qtgui-attribution-vera-font.html To avoid having to flag all such licenses as 'NONE', we now allow LicenseID to contain URN's of the form urn:dje:license:, see also https://enterprise.dejacode.com/urn/urn:dje:license/ Change-Id: Ibf42f00452dbf5d28318b3217a9fe74e33f7c97c Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 43fc39462a72b0f098a6d1412c0b150b2d4942e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use operator| to compose key sequencesFriedemann Kleint2020-09-075-17/+18
| | | | | | | | | | | | In preparation for deprecating operator+. It's deprecated in C++20. Insert casts as necessary. Drive-by, prepare for deprecation of operator+ for building key sequences. Initial-patch-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Change-Id: Iaae4e35a56aa1c2365bc25af2582cf820de38d5e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit ae8239a53ea9c512d60f54903c741aab33a6b439) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* winrtrunner: Remove Windows Phone supportOliver Wolff2020-09-0210-1826/+2
| | | | | | | | | | | | Windows Phone has not been supported for a while now. With newer Windows versions the functionality causes issues. On build 1909 the application hangs in CoUninitialize when called with --list-devices and in build 2004 the needed classes are not registered at all. Fixes: QTBUG-86293 Change-Id: I74a4cb03c246414df587ef1fc1187577e3c40775 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Miguel Costa <miguel.costa@qt.io>
* Add changes file for Qt 5.15.1Antti Kokko2020-08-311-0/+47
| | | | | | | Change-Id: I25043b2742a82bd9318b7977360a88776ce6534c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 72744ac361a94bfd80af16403a69f8ff2422d583) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Fix incorrect loop when processing tagged \fn parametersTopi Reinio2020-08-241-1/+1
| | | | | | | | | | | This fixes ASSERT: "uint(i) < uint(size())" in file qt5/qtbase/src/corelib/text/qstring.h, line 1067 Fixes: QTBUG-86188 Change-Id: I77e76d45b04561ad1ca63bc526fd7473e8c761f9 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit c3ca1f972e402281d3ec42498d3051767449a41b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* windeployqt: Add an option taking a list of languagesFriedemann Kleint2020-08-181-3/+12
| | | | | | | | | Fixes: QTBUG-85841 Change-Id: I8b731ded7b707f510ba41385998b78b191ba9f4c Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 5cc0dabf472ae6ef962473930ab40f11ed29ebf1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add binary compatibility files for 5.15 for QtToolsMilla Pohjanheimo2020-08-173-0/+62216
| | | | | | | | Binary compatibility files added. Change-Id: I6487cd4efbae9df1a5873b4f0c9ba4b511c0c1ac Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* qdoc: Fix regression in processing macro parametersTopi Reinio2020-08-121-0/+9
| | | | | | | | | | | | | A previous commit removed a crucial part of the code for resolving the type and name of a parameter. This commit partially reverts be0ba30d995ac7504d3ec69145ea425d1e68e7df. Fixes: QTBUG-86010 Change-Id: Ib34320e767e12bb42477cd406e51faf7bcfbf62c Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 6ef42beb152dd74e74d8aaeaf644581fbd88dfb0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Avoid changing html filenamesTopi Reinio2020-08-121-1/+1
| | | | | | | | | Output .html filenames should not change unless absolutely necessary. Change-Id: I17e2c95e18a7e23772d8b425c5255d0672fa6a57 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit db9dd6090c985d1d1ebfafdceb00cf2e252066ba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Fix assert in the DocBook generator when writing property docsTopi Reinio2020-08-121-2/+8
| | | | | | | | | | QXmlStreamWriter::writeAttribute() must be preceded by writeStartElement. Change-Id: Ib73c44b16308b882d80544ec07cddf80339bb315 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit cb3d21e8085995e99ab60c66b361ed379054102a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Replace Qt::MidButton with Qt::MiddleButtonEdward Welbourne2020-08-108-25/+26
| | | | | | | | | The latter has been the preferred name since Qt 4.7.0. Change-Id: Ic6e1969788fb408929614474faac0bfc3fdfb602 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 8f269096b340b6ad384d00e841105b63b9e987a0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Correctly handle default values for \qmlmethod parametersTopi Reinio2020-08-077-17/+17
| | | | | | | | | | | | | The QML parser in QDoc was already able to parse default parameter values listed for \qmlmethod in a .qml file, but they were not handled when the command appeared in a .cpp or .qdoc file as a different code path is used for those. Fixes: QTBUG-85756 Change-Id: I671a19b66f82e1a6cd81b8bb487dffa2133ee65d Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 98cca5ff823fe2d4e41f45173e0675bcdf9e2542) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Replace qInstallMsgHandler() with qInstallMessageHandler()Edward Welbourne2020-08-051-2/+2
| | | | | | | | | The latter has been the one to use since Qt5 came in. Change-Id: I51fc5e20bbc9b3cf1e2e46c3895878a2022274ab Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 005f6f0bb3139a9d90daabab06bab2b346eb9de4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macdeployqt: Don't copy .prl files into the Resources folderAndy Shaw2020-08-031-2/+8
| | | | | | | | | | | Since the prl files are now in the Resources folder for a framework, then we should avoid copying these as they are not needed in the deployed framework. Change-Id: I0c728a647784b3d770bdd289c6deb8ff3d5ec9bd Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit 819983972f3e8d7062c94d073b83ee7821a188ab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: I726ab1b585594b901989508f76ab37a56c5cf8f6
* Doc: Remove obsolete warning from QDoc manualTopi Reinio2020-07-271-4/+0
| | | | | | | | | The documented argument types for the \list command all work. Change-Id: Id559a15a1b0e3ad77bf166be000289d01471e093 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit e619edc7034cb3276ccc4b3c93348042115d8fe8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: DocBook generator: Stop generating empty synopsis for shared nodesTopi Reinio2020-07-142-9/+3
| | | | | | | | | | Shared comment nodes must be skipped when generating DocBook synopsis to avoid incorrect output and documentation warnings. Fixes: QTBUG-82874 Change-Id: I8f9e4b0e921053dcd603a2f515eb59a6f42b4c84 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit dbc3ea8150aebe8b4964c533c2f6faecfc01f816)
* Skip building assistant without sqliteKai Koehne2020-07-091-2/+3
| | | | | | | | | | | Both assistant as well as qthelpgenerator requires sqlite. Fixes an issue for static builds introduced with commit c35cd309f480d Fixes: QTBUG-84755 Change-Id: Ibceb04429fd6d56d4505b7319396e72a179ffdd1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit e8da2e1b287b1d06b0124ab443af6f8a698c4fa8)
* qdoc: Prefer sorting nodes based on the nameTopi Reinio2020-07-011-1/+1
| | | | | | | | | | | | | | | | | | \generatelist and \annotatedlist commands sort the elements using Node::nodeNameLessThan(). For node types that are not page nodes (they do not generate a page of their own) or functions, the sorting function considered the location (i.e, file path of the declaration) over the actual name of the node/element. This is almost always incorrect as the preferred sort order is alphabetical, and the location is typically not visible in the user-visible docs. Fixes: QTBUG-85370 Change-Id: I37ae63e34fef966e3863749b3f0cafd9bc230ca0 Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit a08f730d49b14ac5e96ba7c10689a7d470f48f87) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix the buildSona Kurazyan2020-06-293-3/+3
| | | | | | | | | | Fix the build failing after d7ccd8cb4565c8643b158891c9de3187c1586dc9. Change-Id: Icba7cc1fa168a99b4f543bee691925104fb2197f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit 623ebde405a7f8c939cd83b8d9fbbf8dfa7ba263) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: make it clearer that setUsesFilterEngine is required for filteringSamuel Gaist2020-06-081-4/+5
| | | | | | | | | | The new API to use is an "opt in" with regard to the deprecated API so make it more prominent in the documentation as it is easily missed. Change-Id: Ifacac03f0e05cea141c6c4a7d88eaac609e7b712 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 131d08f789237cd59d108e8ca882a797089764f9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Ensure QML method parameter types are generated correctlyTopi Reinio2020-06-0411-43/+31
| | | | | | | | | | | | QDoc uses a simplified method of parsing the parameters for QML methods and macros. This code had issues, resulting in parameter types being dropped from the output in certain cases. Fixes: QTBUG-84364 Change-Id: I245dd423ab0583ae826594a618d85c2876543077 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit be0ba30d995ac7504d3ec69145ea425d1e68e7df) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Improve handling of templated typesTopi Reinio2020-06-049-17/+99
| | | | | | | | | | | | | | | | | | | | | The Clang visitor did not differentiate between templated class-like types, always assuming that it is a 'class'. Fix this by retrieving the type of the specialization the template refers to. Ensure that templated structs and unions are named correctly in the generated output. Handle the type of the cursor that refers to a templated type alias, and improve the code for resolving the template parameters for aliases. [ChangeLog][qdoc] QDoc now correctly handles templated structs, unions, and type aliases. Fixes: QTBUG-67432 Change-Id: Ia0fbfe7b7f22a54270650d96d0d67a4b8b8fd182 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 4f97a639cc39e8b1a42181a662b1059cd9c1d581) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix MSVC runtime detection for WinRT debug binariesPaweł Wegner2020-06-031-1/+1
| | | | | | | | | | | | Prior to the fix if the app depends on any library with 'app' substring in the name the build will always be detected as release. For example WinRT apps which depend on vccorlib_app library will always be detected as release. Change-Id: Ib17376962f3d5120211338b4baa08a431a226dd7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 096dfcf4f0d153546ca2bad4191b471c97731970) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* windeployqt: Deploy Qt3D renderer plugins added in 5.15Friedemann Kleint2020-05-281-0/+1
| | | | | | | | | | | Add the association of the plugin directory. Fixes: QTBUG-84477 Task-number: QTBUG-61151 Change-Id: I00b48dfccdc88bead63180a948eb8bc08a7ffb32 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 1a1a18b86c7fb2c4213be276268830f3b1524ac7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Assistant: Fix build with qtwebkitAlexander Volkov2020-05-271-0/+2
| | | | | | | | | Amend b3cdd63d4bdaea09222fb93ffcd5104a2dc0bf2e. Don't declare HelpViewer::resizeEvent() when HelpViewer is inherited from QWebView to avoid linker error. Change-Id: Ib4ca6823cf17c238eb08ecc531870d66db202269 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Qt Designer: Fix remaining warnings about QString from ASCII conversionFriedemann Kleint2020-05-253-7/+11
| | | | | | | | | | | | | | Rewrite the message handler to take a QString and fix occurrences in actions code, fixing: src\designer\qdesigner.cpp(107): warning C4996: 'QString::QString': Use fromUtf8, QStringLiteral, or QLatin1String src\designer\qdesigner_actions.cpp(325): warning C4996: 'QString::QString': Use fromUtf8, QStringLiteral, or QLatin1String src\designer\qdesigner_actions.cpp(509): warning C4996: 'QString::QString': Use fromUtf8, QStringLiteral, or QLatin1String src\designer\qdesigner_actions.cpp(515): warning C4996: 'QString::QString': Use fromUtf8, QStringLiteral, or QLatin1String Change-Id: I9841cfff7fc7ab125168cd771eac55bfa7efe433 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 687b8d957a2288ce27ca6d3dd2a267aa6b85212e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix name of host tools on WindowsKai Koehne2020-05-192-0/+4
| | | | | | | | | | | | | | | Make sure that qdoc, qtattributionsscanner, get an .exe if built on Windows. CMAKE_BIN_PREFIX is usually defined via create_cmake.prf, but in the case of the two tools this isn't used. Fixes: QTBUG-84304 Change-Id: I5d8d77b07012187c7939b9eb1afa9ddffac8c918 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit 1d4942ac20feb3cbbcd80622756fd4e1cf02e3f0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Fix regression in HeaderNode name handlingTopi Reinio2020-05-199-1/+256
| | | | | | | | | | | | | | | Node::plainFullName() constructs a fully qualified name for a node, traversing the chain of parents until it comes across the root namespace or a HeaderNode - but if the start node was already a header, it incorrectly returned an empty string as the node name. Fix the issue and add a test for output generated by \headerfile command. Fixes: QTBUG-84070 Change-Id: Ib214c53be8ed0eea98708219a00ba43970cd4177 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit a4d4aad793561ee3e397595f8a1db71651bc1b1b) Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Polish the SimpleTextViewer exampleFriedemann Kleint2020-05-196-45/+57
| | | | | | | | | | | - Port to Qt 5 connection syntax, fixing error in Qt 6 QObject::connect: No such signal QComboBox::currentIndexChanged(QString) in findfiledialog.cpp:194 - Remove unused functions and parameters to avoid QOverload - Add process error handling Change-Id: I923f44ce0eb27b7f73f9a0e16c11f48a80a0c03a Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 153b75db83ca4d3db26829bd85271e7fa88b402c)
* Qt Designer: Document Qt for Python usageFriedemann Kleint2020-05-181-7/+94
| | | | | | | | | Split up the chapters and add one about Python. Change-Id: I58c5fe4ceeca5978c0dfbe73ab726a18080d21ea Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 150c2fbad94ae99833da27be7ea9fa13412eeba7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-1437-54/+409
|\ | | | | | | Change-Id: I603c595fa1a4f91838d2766e15b3b1fd7e0c7f72
| * Add changes file for Qt 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.05.15.0Antti Kokko2020-04-291-0/+58
| | | | | | | | | | | | Change-Id: Ic2b7cb24226f4dcd59a566b4cf1d58f380c44080 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * qdoc: properly implement \typealias commandTopi Reinio2020-04-2336-54/+351
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \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>
| * Merge remote-tracking branch 'origin/5.15' into 5.15.0Qt Forward Merge Bot2020-04-2231-136/+220
| |\ | | | | | | | | | Change-Id: I1fdd80c6b7c2615815acc262f01a3893d28406a3
View Lorry Controller Status