summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+33
| | | | | | | Change-Id: I95212a61dddc2f4bc0a7e3700c52679986188b77 Reviewed-by: Lucie Gerard <lucie.gerard@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | | Change-Id: I431c0fe718d173a6c45ade6b17b461586a5f0ca7
* Test that extraction of translations works from .qrc files with QtQuickCompilerSimon Hausmann2019-05-091-0/+2
| | | | | | | | | After commit f01e72a82b59c214ce4b0a6ecefb604bc66ddd3e in qtdeclarative, we can test this scenario now. Task-number: QTBUG-75501 Change-Id: I64baa98da6b17c24b1e309c4dc93525a4fa8d057 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add build information for QDoc on Debian-based Linux distributionsRichard Weickelt2019-05-131-2/+11
| | | | | | | | | | | | | | For Debian-based Linux distributions, the installation instructions are a bit misleading. It is generally not necessary to install a full-fledged LLVM and the requirements for building and running are slightly different. This patch makes it clear which packages need to be installed and how LLVM_INSTALL_DIR needs to be configured in that case. Task-number: QTBUG-68477 Change-Id: I06397d0d16fb29aba07a399b35b6ae3b32d5c80e Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Assistant: Enable clear button in the index and search widgetsFriedemann Kleint2019-05-102-0/+2
| | | | | Change-Id: Ifa37e14c33982db6c936fe077ed0639feed091f1 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Assistant: Highlight the whole search phrase if enclosed with quotesAndy Shaw2019-04-291-2/+5
| | | | | Change-Id: Idd65fa2c3313ca240b9c2721e886dd31ebfe7f00 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* QDoc: Add llvm-config-9 as llvm detection candidatePaul Wicking2019-04-231-0/+1
| | | | | Change-Id: Iceeaa8f64e1168efb5f7e9133e5ef51e2dea367b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+24
|\ | | | | | | Change-Id: I46e92ea28189b7365b34ba42de395be5293ef2af
| * Add changes file for Qt 5.12.3v5.12.35.12.3Antti Kokko2019-04-051-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + b4597180191734ca128772d2b8547c6e6c08efa2 macdeployqt: Deploy the platforminputcontext plugins and vkb plugins + a7aaa84f0c18c150e7d7671663a175d99cad3d49 qtdiag/Windows: Output all graphics adapters + 11d01e3b74c84e465246a8f164b3f3b8ff92d8a4 Handle recursion depth errors when parsing JavaScript + 9b5c31944fb03eea6025186c27cf809cc4a9ae05 Designer: write out minimumSectionSize property before current size + 30616088b98b4f95f85993c069c8086d36151caa Handle recursion depth errors when parsing JavaScript in lupdate + c7dbb12a734b4203c3613ae3950b2e7729643d66 Use High DPI pixmaps in assistant + 44348513f90bd24674172b87a97e0c8b615a555a Bump version + 9c7502b0e5056da021ace0195e53d5b7b410120b Assistant: Rewrite the search result list formatting to use QTextStream + e9662ddd86f027bdbe617f5171cd63cae13b3845 qtattributionsscanner: Add "PackageComment" field + 9beac9838510e94338377fcd1cfc68b371f32a86 makeqpf: fix crash + 50335cb26bb88930f5e2a204642439cc9a4d2282 Mark throwRecursionDepthError() as final Change-Id: I68c23bd2395968511f70209bfcc9496355b0b734 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | qdoc: Don't include shared comment nodes in summary sectionsTopi Reinio2019-04-101-0/+2
| | | | | | | | | | | | | | | | | | | | This caused empty table cells in 'Public Types' for several C++ classes. Task-number: QTBUG-74779 Change-Id: I701967e26955c7807e2f777bb43f67a0ea1c1edb Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Fix a crash when closing the Manage Bookmarks dialogJarek Kobus2019-04-051-1/+2
| | | | | | | | | | | | | | | | | | | | Before, we have deleted the bookmarks dialog directly from it's closeEvent. It means that its closeEvent invocation wasn't finished yet -> crash. We use deleteLater now instead. Task-number: QTBUG-72218 Change-Id: Ia83f9d2027a63ccaccebe22a8e5d92e808bec2bd Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | CMake: Fix policy warning CMP0058 when using qt_create_translation(...)Kai Koehne2019-04-031-1/+2
| | | | | | | | | | | | | | | | | | | | Properly declare the generated _lst_file that lists all lupdate input files as a BYPRODUCT. This is required by the Ninja backend to properly track the build dependencies, and fixes a CMake warning CMP0058. Task-number: QTBUG-71354 Change-Id: Idb3481ef1f0d6763ce14849ca57cb12647d41703 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | lupdate: Escape special characters when processing QMLLucie Gerard2019-04-034-65/+69
| | | | | | | | | | | | | | | | | | The transcode function is now in a parser tool class. It is used by the cpp and qml parser. Fixes: QTBUG-40639 Change-Id: I3c9c9d137669900642a077cf81a739bfc31be800 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | qdoc: Add support for CMake commentsKai Koehne2019-04-022-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake uses # as a line comment marker. To detect CMake files we check for the suffix .cmake, or check whether the filename is "CMakeLists.txt". See also https://cmake.org/cmake/help/latest/manual/cmake-language.7.html [ChangeLog][qdoc] qdoc now uses #! as a snippet marker in .cmake, CMakeLists.txt files. Task-number: QTBUG-73058 Change-Id: I230b113f0d49dd487b0f1926c815295a8a660a27 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Convert \r into a numerical entityLucie Gerard2019-04-022-3/+3
| | | | | | | | | | | | Task-number: QTBUG-41562 Change-Id: If03df28095212f2ee9f74eeaf03c50a6f1203415 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | lupdate: Do not touch a translated file without target languageLucie Gerard2019-04-0221-14/+114
| | | | | | | | | | | | | | | | | | | | [ChangeLog][lupdate] lupdate will now generate an error if it is asked to update a .ts file with translations, but without a target language. This is to ensure that plural translations are not destroyed. Fixes: QTBUG-53775 Change-Id: I646c1f2ec42a32dbc1a4676ad784887613607b78 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Add forward looking after ColonLucie Gerard2019-04-013-2/+60
|/ | | | | | | | | | | | | | | | | | | Colons seen are remembered in order to identify a member or base class identifier. In case of declaration of a bit field, the colon should be ignored. If it is not, unexpected behaviors compromise the resolution of the context, when the context is not explicit in the tr() function. To differentiate between colons in a member or base class identifier, and colons in a bit field, this patch implements a heuristic: We parse forward to either a '{', or a ';'. If it is a semicolon we assume it's a bit field, if it is a curved open bracket we assume the colon is for a member or base class identifier. Related auto test in case of bitfields declaration added. Task-number: QTBUG-55479 Change-Id: I2ca1124c192e4ab16fd449afc634a5de5023f481 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Mark throwRecursionDepthError() as finalUlf Hermann2019-03-273-3/+3
| | | | | | Task-number: QTBUG-74510 Change-Id: I4c6e20a55d76e308808f091fb224ee5c612bc239 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* makeqpf: fix crashRaymund Apfelboeck2019-03-261-5/+9
| | | | | | | | | | Also fix generation of special characters like space [ChangeLog][makeqpf] Fix assert when rendering font using debug build of Qt Fixes: QTBUG-46544 Change-Id: Ic17ee44973d3f85b5d2ae4423a059223abd52ea5 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* qtattributionsscanner: Add "PackageComment" fieldKai Koehne2019-03-258-1/+12
| | | | | | | | | | | | | | | | | | | | Add a new field that can be used for general purpose comments about the package, not to be included in the generated qdoc documentation. JSON does not support comments as a first-class concept. A common workaround is to use duplicated key entries, so that the first one can be used as a comment field. Anyhow, this is arguably a hack and not common knowledge. The name is inspired by the "PackageComment" field in SPDX. The new feature should already be made part of 5.12 so we can clean up version information that recently became more prominently visible as part of the qdoc title - see https://doc.qt.io/qt-5/licenses-used-in-qt.html Change-Id: Icfe843d1d725618114442687222c24122d0dd6b9 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Assistant: Rewrite the search result list formatting to use QTextStreamFriedemann Kleint2019-03-221-23/+24
| | | | | | | Task-number: QTBUG-74353 Change-Id: Ia1a08949d26bbfa288b83a2553f181c587296d3b Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Bump versionKari Oikarinen2019-03-211-1/+1
| | | | Change-Id: I839259639ef0598cdace77b29ec484b0f6f388a2
* Use High DPI pixmaps in assistantAlexander Volkov2019-03-201-0/+1
| | | | | | Task-number: QTBUG-61052 Change-Id: Ia8e1953535a3bb46f8c5615e204ef1b4b78cd9dd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Handle recursion depth errors when parsing JavaScript in lupdateUlf Hermann2019-03-191-0/+7
| | | | | | | | Implementations of QQmlJS::AST::Visitor are required to do so. Task-number: QTBUG-74510 Change-Id: I0081d2d2e4385402022a6eb8b046e82ebd68983c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Designer: write out minimumSectionSize property before current sizeChristian Ehrlicher2019-03-181-16/+18
| | | | | | | | | | Make sure that minimumSectionSize is handled before currentSectionSize so a current section size lower than the default minimum section is properly handled. The same is done for QtBase in 7aa1078ecb8afd96050771635c0d3fa4238d3338. Change-Id: Id33ff11ef35cc92e0adf13402dc847b8f45c38a9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Handle recursion depth errors when parsing JavaScriptUlf Hermann2019-03-187-0/+41
| | | | | | | | Implementations of QQmlJS::AST::Visitor are required to do so. Fixes: QTBUG-74510 Change-Id: I061240f15ce082a05dd7829d225a5bfc3edd896a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-153-5/+39
|\ | | | | | | Change-Id: I23480fa2e34e33736d27cd692474f660e81ce9da
| * Add changes file for Qt 5.12.2v5.12.25.12.2Antti Kokko2019-02-221-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + ee9f6ec9b9e8f0d18ad7e8fededb5292abb91912 lupdate: Add support for parsing C++11 raw string literals + 2ed52386508ae6c674dd58d928cc0cffff98287e Bump version + a802a3b6786e8d94b17acbb6d76826eb103e3d15 Fix fileExists() query + 4832a3e3477d7030236439fa7902502af7f4a122 windeployqt: Remove unused method + d509f627e234c5696c1a28aec2d9d81b591277e4 windeployqt: Use nullptr were applicable + 150cccb4a935a2a889ac8379e08dcaa52e48f6b5 windeployqt: Fix clang warning about switch statement + 9f5f80570c91f6da8f558f305c51734768fbec7c Check that similar message does not have an other exact fit + 2290db250851f00bdec071a5431a8f763d232efb Check the parenthesis depth in case of right parenthesis token, to set metaExpected + b8931820d660457889ee8bbe7ab072ee5ab63adb linguist: Replace splash screen image with 128px application icon + d264cde2c754a683a723a2b5aad9b634a07eea21 Disable qtdiag on WebAssembly + 536c58c55641f2b93c95aa38d2893385f412786d Make windeployqt cross-platform (again) + 802aa37f7725ca3d75d1e928d845c6df534943ba qdoc: Add complete version string to the HTML title + b7decf54170ce71811bcbc13526e31914b0498e9 qtattributionsscanner: Add version to third-party component name + 6c8d836335a0eb57c76aee78b700893ca014fc90 macdeployqt: Deploy QtSpeech tts plugin Change-Id: Ic739392725dec77e40193fe51b3902abae6df311 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
| * QDoc: Further improvements to libclang detectionPaul Wicking2019-02-212-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cases where llvm-config was installed without libclang-dev, the llvm-config candidate detection happily proceeded with the first version it found. This change improves on this by checking if the candidate also has clang-c/Index.h (our dependency). This change also adds llvm-config-8 as candidate for locating libclang, and tidies up some of the log messages from configure. Change-Id: I2746c5f427279ab38db4b20a123b695ecaebd1e9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 6ef3752a7a13b29a20b20c98cf6845f02f24c9c6) Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | qtdiag/Windows: Output all graphics adaptersFriedemann Kleint2019-03-141-5/+9
| | | | | | | | | | | | | | | | | | Use the new functionality in the QPA interface. Task-number: QTBUG-50371 Task-number: QTBUG-65882 Change-Id: Id42ae50099fe5064e32dedbe6364254058a0508f Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | macdeployqt: Deploy the platforminputcontext plugins and vkb pluginsAndy Shaw2019-02-271-0/+10
|/ | | | | | | | | When the gui module is used then the platforminputcontext plugins should be deployed. Additionally if that includes the virtualkeyboard plugin then those should also be deployed with it. Change-Id: I2787792e91a9cfe3603a4e2e29273f682942bf36 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* macdeployqt: Deploy QtSpeech tts pluginSamuel Gaist2019-02-121-1/+2
| | | | | | | This patch adds deployment of the QtSpeech plugins. Change-Id: Ifc55f40cdc0ed6fd9444993c04f4d76249649daf Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* qtattributionsscanner: Add version to third-party component nameKai Koehne2019-02-121-2/+4
| | | | | | | | This is information important enough to show up in the title, and therefore also in the overview pages. Change-Id: I4bad7b46e186e34133a8a3cebe0c68cebec0e76c Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* qdoc: Add complete version string to the HTML titleVenugopal Shivashankar2019-02-111-7/+5
| | | | | | | | | | | | | | | | Typically, most developers will have a setup with multiple versions of Qt installed, such as 5.12.0 and 5.12.1. This means that there will be several versions of the same document installed. For example, when a developer tries to search for 'Item' keyword in the Qt Creator help mode, they will be presented a list of two topics to choose from; one each for 5.12.0 and 5.12.1. Unless the HTML document includes patch version info in the title, it is hard to differentiate between to two topics in the list. Task-number: QTBUG-73620 Change-Id: I183bf6476f57d65cf2bcae52289dcb4779a87caf Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Make windeployqt cross-platform (again)Marius Kittler2019-02-061-0/+7
| | | | | Change-Id: I58d3d37fcc4d9da5879000e999707b007c4a7b39 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Disable qtdiag on WebAssemblyEskil Abrahamsen Blomfeldt2019-02-041-1/+1
| | | | | | | | | We are getting a compiler error for this, and it does not make sense on a GUI-only platform. Task-number: QTBUG-73463 Change-Id: Id7bf3ba2f51849e5ec88c86fe35f061b0175f7b9 Reviewed-by: Liang Qi <liang.qi@qt.io>
* linguist: Replace splash screen image with 128px application iconAlessandro Portale2019-01-254-3/+3
| | | | | | | | | | | | | The "splash screen"/"about linguist" image consisted of a custom-made image with an embedded application icon. Due to the high frequency of changing Qt logos and application icons, this became a maintenance burden. This patch replaces that custom-made image with the 128px application icon. Change-Id: I990d57f7866abcafdb67a21173357b0ad5c6a01e Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Check the parenthesis depth in case of right parenthesis token, to set ↵Lucie Gerard2019-01-251-1/+4
| | | | | | | | metaExpected Task-number: QTBUG-41933 Change-Id: Ic5d68de5cd6faddeb792737dcf125e1feae70dce Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Check that similar message does not have an other exact fitLucie Gerard2019-01-231-3/+7
| | | | | | Task-number: QTBUG-69521 Change-Id: I77d936feb4d4ee189ed1c774b5e2afecfad7676b Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* windeployqt: Fix clang warning about switch statementKai Koehne2019-01-231-0/+1
| | | | | | | | warning: unannotated fall-through between switch labels insert 'break;' to avoid fall-through Change-Id: I1aeae4233898a59eac9872485ec12cde2278ade5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* windeployqt: Use nullptr were applicableKai Koehne2019-01-221-37/+40
| | | | | Change-Id: Ifb01b7fab32c99b3d6621cc83dba72955a3cad39 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* windeployqt: Remove unused methodKai Koehne2019-01-221-1/+0
| | | | | Change-Id: I591d666936bd96a10730585aa904b8e44b5128a2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-01-1838-69/+61121
|\ | | | | | | Change-Id: I8ea54fdacbda23e07d79a543e3c70c0a02cf5092
| * Add changes file for Qt 5.12.1v5.12.15.12.1Antti Kokko2019-01-151-0/+59
| | | | | | | | | | | | | | | | Change-Id: I6edb216bb063f7794d12e1d2731b4f86f7e16227 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * windeployqt: Deploy the Qt Virtual Keyboard pluginsAndy Shaw2019-01-091-0/+1
| | | | | | | | | | | | | | | | The plugins contain some of the asian languages and handwriting plugins, so these need to be deployed as well. Change-Id: I16a03653daefb81c85907220ba50639bb3582df1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Bring the qcollectiongenerator tool backJarek Kobus2019-01-085-1/+138
| | | | | | | | | | | | | | Deprecate it now and redirect it to qhelpgenerator. Change-Id: Iffda5c34c3d6833859c0fb155b52e8b42af02b1c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Assistant: Mark the readonly collection filesJarek Kobus2019-01-084-0/+16
| | | | | | | | | | | | | | | | | | | | | | The qhc file may be installed in readonly location. Don't try to fix tables there, we leave it for the cached qhc file. Task-number: QTBUG-72174 Change-Id: I513c799d2b571a9dd9bc77b7c122e635c863fcff Reviewed-by: Kai Pastor <dg0yt@darc.de> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Merge remote-tracking branch 'origin/5.12' into 5.12.1Liang Qi2019-01-0820-72/+148
| |\ | | | | | | | | | | | | | | | | | | Conflicts: qttools.pro Change-Id: Ibf247399306794b1d79ebbcd230b853896d0bc87
| * | qdoc: Link buildversion field to navigation.landingpageTopi Reinio2019-01-021-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some modules, we use the 'buildversion' string to convey module-specific information such as license type(s). Linking the page helps users navigate to the detailed information displayed (or linked from) the landing page. Task-number: QTBUG-70801 Change-Id: I7f0f8b4d5bbb0306325264101e1478842b162863 Reviewed-by: Martin Smith <martin.smith@qt.io>
| * | qdoc: Don't include overridden functions in all-members listMartin Smith2019-01-021-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an override function is documented, it should appear in the class's all-members list, but the overridden function in the base class should not appear there. This update implements that. Change-Id: Iadc8188d84bc8697aa4a5ec24b7574f1389f27f5 Task-number: QTBUG-72723 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
View Lorry Controller Status