summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
| * | qdoc: Include inherited members in all-members listMartin Smith2019-01-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A refactoring update in qdoc stopped including the class's inherited members in its all-members list. This update corrects that problem. Change-Id: I62faa9f6c61e2dc437945acda6107794acd5ca13 Task-number: QTBUG-72357 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
| * | Move QML documentation example to QDoc testsPaul Wicking2018-12-237-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The import and types contained in the example ends up in reference overviews. This causes confusion among users. The example serves its purpose better as a QML project to generate documentation from as tests for QDoc. Moving the example to tests/auto/qdoc will exclude it from ending up in the online docs. This will also keep the git history cleaner than readding the same files as a separate commit later on. Task-number: QTBUG-43904 Change-Id: I6e080d50319f235916cbd8e1dda3da7dba1dccd1 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * | qhelpgenerator: Always return positive valuesKai Koehne2018-12-221-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While some OS allow negative return values, it's not supported everywhere. Also, negative values are often used for error handling in invocation API. In particular, we want to use execve in the qcollectiongenerator binary, but execve uses -1 to indicate a failure in the launching itself. Change-Id: Icf74e6d002088d7ea1de12d0705f08265396ce42 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * | Qt Designer: Generate global includes for custom widget pluginsFriedemann Kleint2018-12-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate #include <QtQuickWidgets/QQuickWidget> instead of #include "QtQuickWidgets/QQuickWidget" Task-number: QTBUG-72641 Change-Id: I6f2870bbe95ac582fb2137fa3540c79cfe61d06c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | Doc: Update minimum qdocconfPaul Wicking2018-12-191-14/+8
| | | | | | | | | | | | | | | | | | | | | Turn the minimum qdocconf into copypasta material. Change-Id: I923831701f60f5a95b7708326b5bfd669b424edb Reviewed-by: Martin Smith <martin.smith@qt.io>
| * | Bump copyright year to 2019Kai Koehne2018-12-185-5/+5
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-72635 Change-Id: If5acb99bff8715101ab338a694b9f2d61e066ea3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Add binary compatibility files for QtTools for Qt 5.12Milla Pohjanheimo2018-12-183-0/+60749
| | | | | | | | | | | | | | | | | | | | | Binary compatibility files added. Change-Id: I62bc7eb3f791ceab63b492dcf62d1111653ebb1c Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * | Try multiple llvm-config candidates when configuring QDocPaul Wicking2018-12-171-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As llvm-config may be installed as e.g. llvm-config-6.0 on certain systems, depending on which packages are installed, check them in order latest to oldest version supported. Task-number: QTBUG-65762 Change-Id: Ide2f25b5fa73b3da6ea16186aad09b2fec6f0494 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Replace error() with qtLog() in checks for libclang for QDocPaul Wicking2018-12-141-2/+2
| | | | | | | | | | | | | | | Change-Id: I606b0288d08ccb6a5fc19bc950aee161cb6a96c5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | Port qdoc's libclang detection to the configure systemSimon Hausmann2018-12-126-21/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just an initial rough port with a custom config detection. More things can be refined in the future, for example turning libclang into a library to be used with QMAKE_USE. Fixes: QTBUG-72259 Change-Id: Iaf3c42f76b79bdfd07476173c2fd0f4060c11fea Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
| * | Minor clean up in llvm detectionSimon Hausmann2018-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling llvm-config to determine the installation prefix, ignore output on stderr (possibly from the shell), to avoid confusing output when llvm-config is not even installed or in the PATH. Change-Id: I9534ffe90c20040972f3b5390f58936ac4839670 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | Fix fileExists() queryJarek Kobus2019-01-171-2/+2
| | | | | | | | | | | | | | | Change-Id: I6f71e5f47f1cb3e22594a7f596292d04c6e2a303 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Bump versionKari Oikarinen2019-01-141-1/+1
| | | | | | | | | | | | Change-Id: I43b093bc44ff6fd1c83b26fe60f5d7c443334ea4
* | | lupdate: Add support for parsing C++11 raw string literalsPalo Kisa2019-01-093-5/+119
| |/ |/| | | | | | | | | | | | | | | | | | | [ChangeLog][lupdate] Added support for parsing C++11 raw string literals Task-number: QTBUG-42736 Change-Id: Ia246c7e7208580182a1e0413bb38bc2c8ff3f61e Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: I8ddc0630f221e7f2bcf1b7df52f2aeac3ab76e3a
* | QList/Tree/TableWidgetEdit: use correct default flagsChristian Ehrlicher2018-12-246-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | The AbstractItemEditor was using the default flags from an QListWidgetItem as the default values for QList/Tree/tableWidgetItem which is wrong because the different classes have different default flags. This lead to an inconsistent behavior during runtime. E.g. a QTableWidgetItem was not editable but during runtime it was editable. This fix adds a new function to retrieve the correct default flags dependending on the selected widget type. Change-Id: I96e1dec5a459a4d746b469bd773ddb7526e65357 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | winrtrunner: Do not accept fully wildcarded logging rules from environmentOliver Wolff2018-12-201-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an auto test fails in CI, it does another run using QT_LOGGING_RULES=*=true. For winrt builds this rule would enable extended logging for winrtrunner and the output would be flooded with winrtrunner specific information. Instead of confusing the users, we disregard the logging rules in winrtrunner if they do not specifically enable the application's logging so that CI runs will only show information that might be interesting to the user. Change-Id: If51a666315a2e33b83d6a7613a65ab4a152eddc4 Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | wasm: fix finding clang and friendsLorn Potter2018-12-201-1/+1
| | | | | | | | | | Change-Id: Ie05b9896dc7cdb678e6cdc3e2b3caf6e6c2bb5f0 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | windeployqt: Replace typedef by usingFriedemann Kleint2018-12-192-3/+3
| | | | | | | | | | | | | | | | | | | | Fix the respective Clang-tidy warning: utils.h:85: warning: use 'using' instead of 'typedef' [modernize-use-using] as displayed in the Qt Creator issues pane. Change-Id: Ide04ff3bc426ec55b9cdcc1b511119089d6750d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Assistant: Hide Windows Context Help ButtonKai Koehne2018-12-181-0/+1
| | | | | | | | | | | | | | | | | | Do not show the "?" window button "in Preferences", "Print Preview", "Add Bookmarp dialogs". Assistant does not set any "what's this" information anywhere, so the mode is useless. Change-Id: I857159eb313315d197fb2e3bff058fca5d805d64 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | windeployqt: Simplify enabled/disabled modules option parsingFriedemann Kleint2018-12-121-14/+14
| | | | | | | | | | | | | | | | Use a simple vector of and use the mask bit from the qtModules array. Change-Id: I233b5226cce8dfe91018830328c268cf1d16104e Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | windeployqt: Fix some Clang warningsFriedemann Kleint2018-12-124-49/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | - Use range-based for - Remove else after return - Use member initialization - Dubious check of bool * - Prefer static QFileInfo::exists() - Use uninitialized struct QJsonParseError Change-Id: If2705d6829ba3186cafb068a2c083943d33d1c66 Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-114-0/+32
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0b3b98813053be4eaba2109e50bbd5258da209b7
| * \ Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+32
| |\ \ | | | | | | | | | | | | Change-Id: Ia8a70e88a738c968cbcfecbfc666f9ed55667f7a
| | * | Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-231-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + a2a0ff8676bce46ed1ae7c387cbcd2f5377a0e01 macdeployqt: Deploy plugins when -no-framework is used + 523b72743a40df3445e0ab7af421b60b5f76bc55 Doc: Fix language issues in Qt Help overview docs + d07e6b891e69c9ce4bed9e91c917d81d0d8a6ae1 macOS: Don't overwrite the dylibs with the DWARF copy + 10263f42de0d2d1fb731deb4213b76fa6c0acd0f Assistant: Fix a crash when removing the docs + ab73d888c4f41a0d0993abca18680cdcbd79b444 Bump version Change-Id: Ia42723d72cf643207902998fa3fbd2f354b58493 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>