aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Git: Highlight newly added keywords in interactive rebase editorOrgad Shaneh2020-09-072-0/+15
| | | | | | Change-Id: I571e9576fcb781fda4dc5ce2df8a6bbc3a8abf9e Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: David Schulz <david.schulz@qt.io>
* ProjectExplorer: Delay task icon creationChristian Kandeler2020-09-074-6/+14
| | | | | | | | | | | Parsers can change the initial task type when accumulating output, and then the original icon would no longer match. To the user, the problem manifested itself by a missing error symbol in the issues pane and a missing text marker in the editor. Fix this by delaying creation of the icon until it is used. Change-Id: I5349f21c6c0d9bc39a5000ceb33faf88ea62eeac Reviewed-by: hjk <hjk@qt.io>
* QmlDesigner: Fix compile for CMake/qbsDavid Schulz2020-09-072-0/+5
| | | | | | | amends 913dc6473ddd93dbc6d3d260a4a4445696ba3b09 Change-Id: I1337ca5016ca3111ef0b3d714b909b40cdb93ff3 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* CppEditor: Fix crash with adjacent raw string literalsChristian Kandeler2020-09-041-0/+2
| | | | | | | | | | | | Our lexer is not good at handling newlines embedded in raw string literals; basically, it sees every continuation line as a new string. So if such a continuation is followed directly by a new raw string literal, we have to take care to tell them apart properly. In particular, it can happen that an end delimiter occurs before an opening delimiter. Fixes: QTCREATORBUG-24577 Change-Id: I631d0617d85e91f49a25d309d53778da0170eb3b Reviewed-by: David Schulz <david.schulz@qt.io>
* QmlDesigner: Choose target property when dragging image to materialMiikka Heikkinen2020-09-045-12/+277
| | | | | | | | | | When dragging an image to a Quick3D default or principled material, pop up a dialog to choose the target texture property. Change-Id: I8d97ef5bf7c5192c2651fcd8cf64a7f4a87c9847 Fixes: QDS-2326 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Generate qml id from image file nameMiikka Heikkinen2020-09-044-23/+26
| | | | | | | | | | | | | | | When dragging an image file to create a Image or Texture item, base the id on the file name rather than setting it to generic name based on type. This includes cleanup of AbstractView::generateNewId to remove redundant and unused code as well as an option to provide a fallback id prefix. Change-Id: I563f1760ffbace9c5c2145477ec8736836f36c45 Fixes: QDS-2328 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* ProjectExplorer: Properly set up the output formatterChristian Kandeler2020-09-043-6/+15
| | | | | | | | ... for the app output window. Fixes: QTCREATORBUG-24560 Change-Id: I199d7b16f445db498027094792c6cf344d920a88 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* QmlDesigner: Fix crashThomas Hartmann2020-09-041-0/+3
| | | | | Change-Id: Ibb6a14b4b684482b8c6098933a79929c2bd09add Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* CMakePM: Fix removing cmake toolsChristian Stenger2020-09-041-1/+1
| | | | | | | | The id might be destroyed with its parent before trying to reference it again and put it into the list. Change-Id: Ic7bb053293b24f0f0109a1c6479f73b7cbec2dc0 Reviewed-by: hjk <hjk@qt.io>
* QmlDesigner: Disable more properties for QULAleksei German2020-09-031-1/+24
| | | | | | | | Turned off Controls properties and Animations. Task-number: QDS-943 Change-Id: I4b9868734c74f5319fd7d3e66b57d59007300340 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlJSCheck: Workaround for ListElementThomas Hartmann2020-09-031-1/+4
| | | | | | | | | | When editing QML there are false positives reported for ListElement. Task-number: QDS-2602 Task-number: QDS-2716 Change-Id: If3fc297d6609213448f8353e9406b3f0aaf65870 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
* Fix build of Clang refactoring pluginEike Ziller2020-09-031-1/+1
| | | | | Change-Id: Idfdde4b517aa24ea7becbbd67c34bb818a2a0f52 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* QmlDesigner: Disable more properties for QULAleksei German2020-09-032-7/+28
| | | | | | | Disabling more items in ItemLibrary and properties Change-Id: Ib019c1cbe356e0f7e3889d3500c080b0f5756c34 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Clang: Add conditions for adding exceptions flagOrgad Shaneh2020-09-022-1/+14
| | | | | | | | | | | | For GCC it can be deduced from the compiler flags, so no correction is needed. For MSVC it can be deduced from the detected defines. Amends 26693e82126de15145a04c3428a10f6c15120532. Change-Id: Ie4850f328a2afdb3e5158c58f8c30a2644d9c592 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QmlDesigner: Add support for .hdr imagesThomas Hartmann2020-09-021-0/+3
| | | | | | Task-number: QDS-2128 Change-Id: I840d808adb68a7439c0d1ea06f71e20ad53c00e9 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Disable FlowTags for MCUThomas Hartmann2020-09-022-9/+13
| | | | | | Change-Id: I708dad46d92c48991a603819313ce148eccc3b54 Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Android: Don't require arguments for a serviceVille Voutilainen2020-09-021-8/+1
| | | | | | | | Task-number: QTCREATORBUG-24557 Change-Id: Ifc1c9c5c2fcfaba48e043e4334fb019efa611f39 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* QmlDesigner: Update complete sceneThomas Hartmann2020-09-011-0/+2
| | | | | | | | This removes painting artefacts, since the bounding rectangle also gets smaller when updated. Change-Id: Ic184cadbd1dbda1952012b749eadfde0da57ef7f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* AssetExport: Do not export states, timeline and connection nodesVikas Pachdha2020-09-011-2/+10
| | | | | | | | Nodes of type QtQuick.Item should only be exported Task-number: QDS-2667 Change-Id: I099b2d1d2a14ded5de46c2852306d5825a89034a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* AssetExport: Fix incorrect Node lineageVikas Pachdha2020-09-011-9/+12
| | | | | | Task-number: QDS-2667 Change-Id: I50bd4fbd093734d2df35fce8aed57af28469d358 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Change CoffeeMachine startup fileAleksei German2020-09-011-1/+1
| | | | | | | | Task: QDS-2690 Change-Id: I7ab7a596bf940903c3feb3fbff5324fbd64f16bf Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Make active3dScene internal (not saveable)Mahmoud Badri2020-09-012-4/+2
| | | | | | | Task-number: QDS-2699 Change-Id: I7c8e8245c7f4631a7f3cac121ed9a88e3395f579 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix for macOS issueThomas Hartmann2020-09-011-7/+7
| | | | | | | Task-number: QDS-2708 Change-Id: If7a2f850b9ada74f590574214f7bd1384e3f67e0 Reviewed-by: Knud Dollereder <knud.dollereder@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* AssetExport: Notify QML parsing errorsVikas Pachdha2020-09-011-6/+17
| | | | | | | | QML can not be exported if the document have parsing errors Task-number: QDS-2667 Change-Id: I22075789cfa5853b1607c45e2b49bb761836c0d6 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* QmlDesigner: Disable Properties unavailable in QULAleksei German2020-09-011-3/+40
| | | | | | | | | | | Disabling properties in: MouseArea Flickable Image Text (including Font) Change-Id: Id0a44fa73ff80bf4749c0bdc0f9eac3e2f488762 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Do not show items not available fot QtForMCUThomas Hartmann2020-09-011-4/+43
| | | | | Change-Id: Ia61634a5108db51b49241fd58b73ab71e9e5e2e8 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix indirect connection targetsHenning Gruendl2020-09-011-1/+1
| | | | | | | | Fix ConnectionView ComboBox to also include connection targets for alias and custom properties in inherited external components. Change-Id: Ic130adebef9de93efef5d2ed61178fed45242cb7 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Update StudioWelcome tutorialsThomas Hartmann2020-08-3110-0/+42
| | | | | | | Change-Id: Ic5053eee4df2fa559b18fc77330b7837c146e2ff Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* AssetExport: Export the metadata oustside the project directoryVikas Pachdha2020-08-312-3/+10
| | | | | | | | Name the metadata file after the project being exported Task-number: QDS-2612 Change-Id: Ia073f6969708f2ed89552dfc7a38305563e2bef2 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* WinRt: Fix BuildStep soft assertChristian Kandeler2020-08-311-1/+3
| | | | | Change-Id: Iee7290796737b629c7241ef441099a449f0fae5c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* QmlDesigner: Reset puppet after removing SLConnectorMiikka Heikkinen2020-08-311-0/+2
| | | | | | | | | | Changing imports resets the puppet before SLConnector gets removed, causing puppet load to fail. Added additional resetPuppet call after SLConnector removal to ensure puppet is loaded correctly. Change-Id: Ia26bbcbd39fe4c59a4795fa0052d0adedac789b7 Fixes: QDS-2662 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: More compile with namespaced Qthjk2020-08-311-0/+2
| | | | | | | Amends 4886375994. Compiles for me without. Change-Id: Iaccbe6a2000d1b87008496f0e515a94aa7955061 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* More namespaced Qthjk2020-08-312-5/+5
| | | | | | | | | | Amends b41ea232332dd8d95140169e557aa8ad51770245. Missed that because the file is gone in master. Task-number: QTCREATORBUG-24544 Change-Id: I7e5948d564c370f9ed197d999778151f2fe61b38 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Update properties supported by MCUThomas Hartmann2020-08-291-7/+24
| | | | | | | | | The transform properties are only available for Image and Text. Task-number: QDS-2512 Change-Id: I7c3eb6cb07182afe1e9d307bb5d210f1f2cf9c9f Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Enable Timeline for MCU, but blacklist FlowViewThomas Hartmann2020-08-291-4/+8
| | | | | | | Task-number: QDS-2681 Change-Id: I1b4eb312ce88e1ee7bf052020fd4e9d5cf95021c Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Support dragging images to TextureInputsMiikka Heikkinen2020-08-281-11/+29
| | | | | | | | | | | | Dragging an image to TextureInput item creates a new Texture item at the same level as the TextureInput and binds TextureInput.texture property to the newly created texture. Any existing texture binding is overwritten. Task-number: QDS-2657 Change-Id: I79cf1a11608914ded4b868336a7d1a9c83071d87 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Fix compile of testsChristian Stenger2020-08-281-1/+0
| | | | | | Change-Id: If791e1e2eb7c9b4d04c13ecd5db531abef9069fa Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* LLDB: Append 2 newlines after commandsOrgad Shaneh2020-08-282-4/+12
| | | | | | | | | | For some reason, sometimes LLDB misses the first character of the next command on Windows. Task-number: QTCREATORBUG-14539 Change-Id: Ide78e0a0aa64ea4cbcaf6b55a0acdd548a1fa46c Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Meson: Compile fix for namespaced Qthjk2020-08-288-24/+18
| | | | | | Task-number: QTCREATORBUG-24544 Change-Id: I5a6ff7f561aca0b967471f4532e32a05077e3939 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Fix compilation with namespaced Qthjk2020-08-283-5/+5
| | | | | | Task-number: QTCREATORBUG-24544 Change-Id: I9f16bf9a454f5b97ac6581274b0b08421b24c4da Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* qmake: Prevent injection of empty values via environment variablesChristian Kandeler2020-08-281-2/+5
| | | | | | | | | | | | | | | | | | | | | The qmake $() operator retrieves environment values at make time. In Qt Creator, we still use these values for feeding the code model, presumably because the qmake and make step share a common environment. However, we must take care that unset environment values do not lead to empty strings in qmake lists, as that can have unwanted side effects, especially when these lists get turned into command line arguments that are passed to build tools. A concrete example: A project file contained the following assignment: QMAKE_CXXFLAGS += $(SOME_VAR) SOME_VAR was not set in the environment, so an additional empty argument appeared on the command line when the code model called the MSVC compiler to retrieve some information required for parsing the code. The call failed, the code model had to fall back to default values, and the user got parsing errors. Fixes: QTCREATORBUG-21729 Change-Id: I224369a2fb9c0dd78406253edba03bd44556be44 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Complete documentation on IDocumentEike Ziller2020-08-282-56/+420
| | | | | Change-Id: I72a62beaf6c8de0d2ae39a1c3c833708ca27b03f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Help/Android: Compile with namespaced Qthjk2020-08-282-0/+4
| | | | | | Task-number: QTCREATORBUG-24544 Change-Id: Id06cc623b8a0bfe365dda928cda52a97321732b2 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Handle shaders and commands dragged to passesMiikka Heikkinen2020-08-282-9/+46
| | | | | | | | | | | | Quick3D shaders and commands dragged to passes from item library will be automatically added to corresponding property, too. The shader or command is also moved to the same level as the pass as passes can't have child nodes. Task-number: QDS-2657 Change-Id: Id7efc302b06703ddd669b679b65d3adc9ecb48de Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix for States compilation breakAleksei German2020-08-281-15/+15
| | | | | | | | | | | | Fixing compilation break in StatesEditorView: QtCreator is build with 5.12 QScopeGuard is from 5.14+ Replaced scope guard with unique_ptr original task: QDS-2312 Change-Id: Id6a4bf513f37675044b073be2dfe52e3fa9dc3bc Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Fix for RichTextEditor Qt VersionAleksei German2020-08-281-1/+4
| | | | | | | Original task: QDS-2634 Change-Id: I7edc580aec36090e037c4520ad364a62427df9f0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Allow image drag to create Texture on all materialsMiikka Heikkinen2020-08-271-4/+7
| | | | | | | | | | | | Dragging image asset to any 3D material type now creates a Texture out of the image. Default materials assign the created Texture to a diffuse map and principled materials assign it to base color map. Custom material just creates the Texture without any assignments. Task-number: QDS-2657 Change-Id: I065f98cbc4d8c3293fbacea9ef8649d0a2edfb0a Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Update icon fontHenning Gruendl2020-08-272-1/+5
| | | | | | | | | * Update icon font * Use newly added icons in EditableListView Change-Id: Ia21c2120c54c41cd00dca07622ced98a0bf7f7f0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Annotations for StatesAleksei German2020-08-277-15/+158
| | | | | | | | | - Added Annotations support for States Task: QDS-2312 Change-Id: I204ec958f85bd0f05eae0abbb3848d6d59e7e397 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* QmlDesigner: Remove parent as Connections targetHenning Gruendl2020-08-271-15/+6
| | | | | | Task-number: QDS-2651 Change-Id: Ib4520206cc2a3f8a044a66e3e01db0ec603a3029 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>