summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* OutputFormatter: Prevent consecutive newlines from being ignoredChristian Kandeler2020-09-242-2/+9
| | | | | | | | | Amends b0cad9e9c7. Fixes: QTCREATORBUG-24668 Change-Id: I19a2ea71be91ded8f2c458537dae62a3021afe52 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io>
* LSP: Do not use FullyEncoded in QUrl::toStringChristian Stenger2020-09-241-3/+1
| | | | | Change-Id: I8f978327a1d12f7d418a77ac4bc70b135142f989 Reviewed-by: David Schulz <david.schulz@qt.io>
* GitHub Actions: Bump Qt version from 5.15.0 to 5.15.1Alessandro Portale2020-09-231-1/+1
| | | | | | | The Qt Creator 4.13.1 builds use Qt 5.15.1, as-well. Change-Id: I6e4c8bfc464f624bd1ab9bc27b479fec6edaeca3 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* WebAssembly: Fix the missing auto-detected "C" toolchainAlessandro Portale2020-09-231-1/+0
| | | | | | | By not setting the toolchain language twice. Change-Id: Id7058662047f451dcc524151aa5ff7cec854b9d3 Reviewed-by: hjk <hjk@qt.io>
* QmlDesigner: Fix construction orderMarco Bubke2020-09-221-3/+3
| | | | | | | The connections have to be destructed before the local server. Change-Id: Ie1c349b72c67c4359eba78e9567e38f577c7bc10 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* McuSupport: Add support for desktop backend JSON fileJacek Nijaki2020-09-223-99/+165
| | | | | | | | | | | | | | | | Starting from Qul 1.5 json kit file will be shipped for desktop platform. This change is backward compatible with previous Qul version - if no desktop specific json file is found a legacy code is executed. This change removes "desktop" toolchain, instead "msvc" and "gcc" toolchains are introduced. Additional parameter was introduced to the josn kit file: "platformName" which enables using different strings in kit name and in QUL_PLATFORM cmake variable. Change-Id: Ie0a212aaad47a8033e9a81467f60a23c2bc19a51 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Bump version to 4.13.2Eike Ziller2020-09-223-6/+6
| | | | | Change-Id: I5566275aceb3161d04c89c6d6ef5603d8de03994 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Doc: Show "Managing Sessions" topic in QDS ManualLeena Miettinen2020-09-214-5/+16
| | | | | | | | | | | | - Moved the topic from the creator-only folder to the howto folder root to have it included in the doc builds. - Added the topic to the toc and fixed the navigation links around it. - Used defines to hide text that does not apply to QDS. Fixes: QDS-2805 Change-Id: I583324a1d0bc60c1b6448a52e48b3f09b1039b7f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Fix copyright/license of vcsconfigurationpage.cppKai Koehne2020-09-211-31/+8
| | | | | | | | | | | The copyright and license was changed as part of the 397e7f48 mass change, arguably by erroneously copying it from imageviewer/imageview.h or imageviewer/imageview.cpp. Fixes: QTCREATORBUG-24620 Change-Id: I1f6a631c3b0a437af862d929a921693db367cef2 Reviewed-by: Denis Mingulov <denis@mingulov.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ImageViewer: Change license of files to Commercial/GPLv3Kai Koehne2020-09-212-64/+16
| | | | | | | Task-number: QTCREATORBUG-24620 Change-Id: I8c76b312d4e93346ca70eec92b8b7ac8dfa455d1 Reviewed-by: Denis Mingulov <denis@mingulov.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ProjectExplorer: Remove replacement kitsChristian Kandeler2020-09-214-0/+24
| | | | | | | | | ... for which the original kit has turned up again. Otherwise we'd have more than one kit with the same id. Fixes: QTCREATORBUG-24589 Change-Id: I7ce16615694d3d2c5a5441f676ecb7dc85c2239c Reviewed-by: David Schulz <david.schulz@qt.io>
* Editor: fix hanging when using invalid printer page rectDavid Schulz2020-09-211-1/+4
| | | | | | | | | | Some printer seem to return an empty page rect for some configuration which results in an invalide page count and a freezing ui. Do not print anything and return in that case. Fixes: QTCREATORBUG-24110 Change-Id: I42349bc97734e3f6a67502482d2b02959e865665 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Doc: Clarify info about installing Qt Bridge for SketchLeena Miettinen2020-09-211-5/+8
| | | | | | | Fixes: QDS-2809 Change-Id: I869019d347d0726911183d2014ffa0b5a66d59e3 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Doc: Add OFL-1.1 to AcknowledgmentsLeena Miettinen2020-09-212-0/+193
| | | | | | | Fixes: QTCREATORBUG-24630 Change-Id: Iaaa64bb9936a80805affe992f64e24d1c586496a Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* TextEditor: allow highlightings in selectionsDavid Schulz2020-09-211-2/+1
| | | | | | | | | If the selection foregound color is undefined do not overwrite the already applied highlighting. Fixes: QTCREATORBUG-24656 Change-Id: Ia125e8e6b9efba73d5a13facc2446a793d59f5c3 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Minor Fixes for QDS MCU compatibilityAleksei German2020-09-192-2/+3
| | | | | Change-Id: I401ecf9ce12d7020e78a5449b321fb7927caffed Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix range for "Fixed Frame" in Timeline settingsThomas Hartmann2020-09-191-1/+8
| | | | | | Change-Id: I71bdae7144ae91b9b8b8c8e2088b87310d2f4a2e Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* cdbext: fix mingw compileDavid Schulz2020-09-181-1/+1
| | | | | | Fixes: QTCREATORBUG-24653 Change-Id: I40071a0022be809266b98e1e898e969493b927aa Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Make Translation Tests ignore imported filesLukasz Ornatek2020-09-173-20/+27
| | | | | Change-Id: I4abd222bd15da79a1fe14d01b8a4a1f25d935b3b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* AutoTest: Fix construction of file paths for catch resultsChristian Stenger2020-09-171-4/+7
| | | | | | | | Using Catch2 on Windows with CMake lead to not having file information as the file information was generated differently. Change-Id: I3e0951b517a4a8a86f1ffa1009c1a2815565f3b3 Reviewed-by: David Schulz <david.schulz@qt.io>
* QmlDesigner: Fix StateEditor show event updateHenning Gruendl2020-09-171-1/+1
| | | | | | Task-number: QDS-2798 Change-Id: Ic27e7491012b227e144cdae68ead8ac534cc0d5a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add GridView to ListModelEditorMarco Bubke2020-09-171-2/+4
| | | | | | | | We could simply test for the model property but this can lead to strange behaviour. Change-Id: I4e326890fb02d312b5210089c957dce026a09f94 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Editor: set deleteStartOfLine default shortcut on macDavid Schulz2020-09-171-1/+2
| | | | | | Fixes: QTCREATORBUG-9219 Change-Id: I26f991641efbc914d848591931756666e34c26b7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Update 4.13.1 changes with last-minute updatesEike Ziller2020-09-171-0/+4
| | | | | Change-Id: I789f4fb10c950114ed0737dcb90460d90386e2f3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Python: Fix loading working directoryDavid Schulz2020-09-171-3/+1
| | | | | | Fixes: QTCREATORBUG-24440 Change-Id: I27a543f764e285acf678427cc909d2a95e5cb322 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Fix compilationqds/v1.6.1Marco Bubke2020-09-161-1/+1
| | | | | Change-Id: Ia69deafa77ca234c9f80be10d19fcf582ab5e906 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* QmlDesigner: Improve connection editor dialogHenning Gruendl2020-09-1616-233/+1526
| | | | | | | | | | | | | * Add ComboBoxes to connection editor dialog * Add type toggle to dialog * Add slots and properties to ComboBoxes * Parse connection expression and fill ComboBoxes Task-number: QDS-2498 Task-number: QDS-2495 Task-number: QDS-2496 Change-Id: I2cca6d4c85d1508e54d4ad8863056f22ad777ae6 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Doc: Add LiteHTML license and related licenses to acknowledgmentsLeena Miettinen2020-09-162-10/+151
| | | | | | | Fixes: QTCREATORBUG-24619 Change-Id: I8d28bf8a579e8885b430cd7df292f53363990ffa Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Go into componentsMarco Bubke2020-09-169-26/+125
| | | | | | | | Task-nubmer: QDS-2696 Change-Id: I2f0ee71deea593da08fa4a754d783b53867473ed Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Debugger: Activate split that contains the breakpoint being hitDavid Schulz2020-09-161-4/+6
| | | | | | | | | | Do not change the current editor after hitting a breakpoint if we already have an editor open in another split, but switch the focus to that split. Task-number: QTCREATORBUG-24646 Change-Id: Id85cecdfb522807bafa097e578509853326a2e31 Reviewed-by: hjk <hjk@qt.io>
* Editor: Calculate annotation color based on editor color schemeDavid Schulz2020-09-161-1/+5
| | | | | | | | Amends 9182d4eda75033bbbebf50e87e518adc33d499f6 Fixes: QTCREATORBUG-24644 Change-Id: Id34bfbc4ea3d1102835c7c1cf3afa1580dff01d8 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Change RichTextEditor iconv4.13.1Henning Gruendl2020-09-151-1/+1
| | | | | | Change-Id: I5a294e625f4ac61d15511369d7e765e05447a269 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* AutoTest: Fix possible nullptr accessChristian Stenger2020-09-151-7/+9
| | | | | | | | | If the process of the test executable cannot be started for whatever reason we will not have an active run configuration or output reader. Change-Id: I50146a2c8228ad39574e007ae2659465122ad20b Reviewed-by: David Schulz <david.schulz@qt.io>
* CppEditor: Fix test codeChristian Stenger2020-09-151-2/+2
| | | | | Change-Id: I01073f481ebdae64c30971afd8fb332ee92e2a1e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Doc: Fix broken external linksLeena Miettinen2020-09-153-7/+6
| | | | | | Change-Id: Iaf3502a8d940a5cb2eb45ee7451e834a6d4b756e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* QmakeProjectManager: Restore incremental re-parsingChristian Kandeler2020-09-154-42/+73
| | | | | | | | | | | This was broken in commit 37aecdd112, where we overlooked that a special type of IDocument was used that triggers a re-parse of only the affected part of the project tree. As a result, all changes to a .pri or .pro file would trigger a re-parse of the entire project. Fixes: QTCREATORBUG-24572 Change-Id: I480cff4e53cf86a17e1eaac0eb9b32901bc87051 Reviewed-by: hjk <hjk@qt.io>
* Debugger: Change LLDB value creation hackhjk2020-09-152-9/+15
| | | | | | | | | ... to something that works with LLDB 12. Task-number: QTCREATORBUG-24596 Change-Id: Ib2f8255d45a02fa3d2c737864994397f587e9b15 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* cdbext: remove cdbdetection completelyDavid Schulz2020-09-155-140/+7
| | | | | | | | All required header and libs are inside the Windows 10 SDK, which is required to build with Visual Studio 2017. Change-Id: I68ee7457041653d89e5f5c9e258f9780a417dbe4 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Add 4.13.1 change logEike Ziller2020-09-151-0/+108
| | | | | Change-Id: I8e0b8f6d002c0251268aff1aeddd3470cfdee140 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* cdbext: add option to skip cdb detectionDavid Schulz2020-09-153-20/+33
| | | | | | | | | | Since a few windows sdk versions are the headers and libs of the debugger part of the sdk installation. Add an option to sdkip the cdb detection and fall back to use these headers and libs that are already configured in INCLUDE and LIBS of the vcvars.bat environment. Change-Id: If1eeecdbae34523ddbcc1a22d8640df7fa46bf6a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlPuppet: Return color propertyMichael Winkelmann2020-09-141-1/+4
| | | | | Change-Id: Icc25fb0408aae50f67633688f221194ab6f77cd3 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* QmlJSCheck: Fix crashThomas Hartmann2020-09-141-1/+4
| | | | | | Task-number: QDS-2766 Change-Id: I4b0e81b8104ac35a286a318e87e95ea022ed66f6 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* ClangBackEnd: Support highlighting of alias templatesChristian Kandeler2020-09-145-8/+20
| | | | | | Fixes: QTCREATORBUG-24552 Change-Id: I80d2b16114234cf896173cd4104e6a5f12009f69 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* OutputFormatter: Fix flushing a pending line feedChristian Kandeler2020-09-142-3/+4
| | | | | | | | | ... for the edge case of a lone carriage return occurring in the output. Amends b0cad9e9c7. Also adds missing adaptations to the unit test. Change-Id: I219b24b8fb41bb0fcea9f677cd79286d03b130c2 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* AutoTest: Fix summary for boostChristian Stenger2020-09-141-4/+1
| | | | | | | | | | Do not take skipped tests into account when computing passes out of the available information. These are handled separately and may lead to a negative passes amount. Change-Id: I47bb1f054468dc5374d0d4e7fdeb3ad87efd0dff Reviewed-by: David Schulz <david.schulz@qt.io>
* IncrediBuild: Add plugin metadataKai Koehne2020-09-111-0/+9
| | | | | Change-Id: I76ea1ee35628db6c4cf87fa81d1fee49e4c0ef36 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* LanguageClient: avoid recursive postponed document updateDavid Schulz2020-09-111-3/+17
| | | | | Change-Id: Ibaf8831977e254c7dad10617754e763114993aee Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* TextEditor: Use selection format from the settingDavid Schulz2020-09-111-3/+10
| | | | | | | | | | Overwrites the format generated by QPlainTextEdit::getPaintContext() Amends 9182d4eda75033bbbebf50e87e518adc33d499f6. Fixes: QTCREATORBUG-24479 Change-Id: Ia226a74442dbbdbae42e8da5dee9e4d7399b677c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* CppTools: Guard against null pointer accessChristian Kandeler2020-09-111-1/+1
| | | | | | | | | ... when looking up definitions of variables. Amends a0764603d0. Fixes: QTCREATORBUG-24610 Change-Id: I79e6f69066eaa385013e722ec4793c27231ab8eb Reviewed-by: David Schulz <david.schulz@qt.io>
* QmlDesigner: Fix unintentional item reorderingHenning Gruendl2020-09-111-0/+5
| | | | | | | | | Fix reordering of items in the Navigator if using shortcuts on a SpinBox in the Property Editor. Task-number: QDS-2738 Change-Id: Ia12d2d072c36fbb32156c9729cffd828e8747b28 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
View Lorry Controller Status