summaryrefslogtreecommitdiff
path: root/share
Commit message (Collapse)AuthorAgeFilesLines
...
| * | QmlDesigner: Do not allow keyboard focus on macOS for puppetThomas Hartmann2020-03-262-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | Since we integrated the 3D view no keyboard focus is required anymore. Change-Id: Ia523e1a6b0c1d0ef9912775a91022f28de47b54a Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * | QmlDesigner.PropertyEditor: Hide action indidactors on controlsThomas Hartmann2020-03-2512-2/+21
| | | | | | | | | | | | | | | | | | | | | Task-number: QDS-1688 Change-Id: Ia96a8d5229b42d9ac0be75273cadfc35b5cef334 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | | ProjectExplorer: Set temporary flag on scratch buffer documentDavid Schulz2020-03-241-1/+2
| | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-23509 Change-Id: Ieb3922030cb1dd4984b91ac24d0396bb19a4a711 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-03-235-14/+49
|\ \ \ | |/ / | | | | | | Change-Id: Ic741fdedc168430e5be6cb1645d9329dbc7a6b08
| * | QmlDesigner: Update selection box when target mesh changesMiikka Heikkinen2020-03-232-6/+25
| | | | | | | | | | | | | | | | | | | | | Change-Id: I45d54baa78e9f8547da65358d93c6d376f24ce3b Fixes: QDS-1840 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | QmlDesigner: Add default indicator for StatesAleksei German2020-03-202-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | -Added better indication for default state -Cleaner removal and rename of default state Task: QDS-1825 Change-Id: I6f90ffcf831883999210e5b5534b46fa2a6c1eda Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | QmlDesigner: Fix icon gizmo position update after edit camera changeMiikka Heikkinen2020-03-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing edit camera could take a couple of frames to propagate the the correct position to icon gizmos. It's unclear why exactly this happens, but a trivial fix is to just render a couple of extra frames whenever the camera changes. Change-Id: I8c4fc33bff9cb7a4c4ac3b5105327cc5eb0a45d5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | | Qt Quick templates: move visible assignment after width and heightMitch Curtis2020-03-205-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is more common; visible and enabled are usually after size-related bindings. Change-Id: I2148491d8a8fdbf4f7bc2b261bd6472bae697969 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | | Port from QRegExpValidator to QRegularExpressionValidatorLars Knoll2020-03-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | QRegExpValidator is going away in Qt6, so port over to the version using QRegularExpression. Change-Id: Iecd1ba1f0e5e01009ae43b79c1ccc73f0fc046b2 Reviewed-by: hjk <hjk@qt.io>
* | | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-03-196-31/+65
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.cpp Change-Id: I2a0ccb84560174c5170d5baaff526c0e095f0ba0
| * | QmlDesigner: Fix selection issues in navigator and 3d edit viewMiikka Heikkinen2020-03-193-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed multiple issues with showing correct selection in navigator and 3d edit view: - Dragging items from item library selects only that item, regardless if drag was done to 3d edit view or navigator - Selection is shown correctly after reparenting items, including multiselection reparenting - Adding a new item to the active scene now shows selection box correctly for that item Change-Id: I5156ca4c22e606c41e1e346ea5c32c3d70d89f5e Fixes: QDS-1577 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | QmlDesigner: Fix missing selection box when scene changesMiikka Heikkinen2020-03-192-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly change the selection back to previous selection after a scene change in puppet. Also reduced the existing timeout for executing the pending selection command after calling ensureSelectionBoxes, as we now explicitly render the next frame after selection change and don't have to wait for rendering to trigger otherwise. Change-Id: Ibe8004890910ae15e7ac3172165bc72463c1e5cc Fixes: QDS-1792 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | Android: Add windows usb drivers to SDK essentialsAssam Boudjelthia2020-03-181-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add "extras;google;usb_driver" to essentials packages to be installed automatically. So, change would also account for platform specific packages. Change-Id: I9b452b9ee30be9f606ca77fcd79712d66fab84e7 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
| * | QmlDesigner: Add a simple wireframe cone model for edit 3d spotlightMiikka Heikkinen2020-03-161-21/+24
| | | | | | | | | | | | | | | | | | | | | Change-Id: I013e4fc2d77b49694d887e8cadc05584a904ed62 Fixes: QDS-1819 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | QmlDesigner: Show selection box for component scene roots in edit 3DMiikka Heikkinen2020-03-161-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Components typically have Node as their root item, so having a component as a scene root detects as having a plain Node as scene root, which normally doesn't get a selection box. Change-Id: I66ae1dc3ade4b6f822d768cf71e8feceb0ffa06d Fixes: QDS-1636 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-03-1660-128/+472
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp Change-Id: I4a90920e52dbbe9eb46aef3437ee3c5a6e7b31c6
| * | QmlDesigner: Edit 3D view icon updateMiikka Heikkinen2020-03-1347-58/+35
| | | | | | | | | | | | | | | | | | | | | | | | Added icon for spot light gizmo and updated directional light icon. Removed icons that are no longer needed on puppet side. Change-Id: Id1e72c80e122250f7edc8a69a0e5720e755b96fc Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * | QmlDesigner: Delay camera frustum geometry update in edit 3D viewMiikka Heikkinen2020-03-122-45/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calculating camera frustum geometry requires linked camera spatial node to be up-to-date. However, we can't control the order in which the spatial nodes of cameras and geometries are updated, so geometry update will often happen first. Therefore we need to defer geometry update to the next frame when we detect camera change. Change-Id: I056eb1bf95db357a73511a6bb7ef0c55c6f4befa Fixes: QDS-1649 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | QmlDesigner: Add light meshes to edit 3d viewMiikka Heikkinen2020-03-1210-9/+380
| | | | | | | | | | | | | | | | | | | | | Change-Id: I996498fde14510fc78c729f56cb8d46b28b233bb Fixes: QDS-1634 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * | QmlDesigner: Enable anchoring only in base stateThomas Hartmann2020-03-111-1/+1
| | | | | | | | | | | | | | | Change-Id: Ief2670951281ed801a183057acfaa7d3cad2b3f4 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * | QmlDesigner: Add states propertyThomas Hartmann2020-03-111-0/+13
| | | | | | | | | | | | | | | Change-Id: I17162c01c9b54a70a726990510368cc363ccfb38 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * | Qt Quick Designer: Fix UI text punctuation and capitalizationLeena Miettinen2020-03-113-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | According to the guidelines in https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html Task-number: QTCREATORBUG-23683 Change-Id: Id1f484855396c16d629b5743bef9710e84ba2cd6 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-03-1112-37/+72
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/designmodewidget.cpp Change-Id: I94a94a15df433d6caa8922fccaa69918b5e4e365
| * | QmlDesigner: Add Default State buttonAleksei German2020-03-101-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | Added functionality to change default state from UI TASK: QDS-1747 Change-Id: I78c0a5e8f5abfc18b4dbce9e283ceb1307a537ae Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | QmlDesigner: Update cullingMode API to QtQuick3D 5.15 specsMahmoud Badri2020-03-106-9/+9
| | | | | | | | | | | | | | | Change-Id: Ic4fc6bbd4d2bb7e9968c337eb5775a04c1a6f59c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * | QmlDesigner: Fix edit 3D view tool state initializationMiikka Heikkinen2020-03-093-16/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit 3D view tool state is now always initialized to a stored "no scene" state if one exists to ensure further scene changes properly inherit the tool state in all cases. Change-Id: Ifee5fe58255b51d9dbed57abb2020ea00d94af2c Fixes: QDS-1750 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * | QmlDesigner: Fix Add State Button spacingAleksei German2020-03-091-1/+1
| | | | | | | | | | | | | | | | | | Task: QDS-300 Change-Id: I3c69e9b3871a8879137d25c92cbef3c1a4ae9e8b Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | Dumper: raise exception in gdbbridge callHelper on WindowsDavid Schulz2020-03-092-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gdb from MinGW 7.3.0 and 5.3.0 crashes on Windows when we try to evaluate expressions that result in a function call. At least prevent evaluating such expressions from within the dumper. Task-number: QTCREATORBUG-23477 Change-Id: Ic14148a43b95aa1b52c1d4488958fa66eccdc0b5 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | | Wizards: Make it more obvious to users that they can create C filesChristian Kandeler2020-03-103-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Technically, almost any "new file" wizard could be used to create a C file, but conceptually, it makes the most sense to turn the "C++" category into "C/C++". Fixes: QTCREATORBUG-23621 Change-Id: I002365fa35cc6c9bf7c71039e122f72890f66b1a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | File wizards: Optionally show the default suffixChristian Kandeler2020-03-1013-14/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In wizards that create a single new file, there's almost always a default suffix that gets appended if the user provides only the base name. However, there's currently no visual indication on the page that such a suffix will be appended. Therefore, we add an optional field to the FileWizardPage that displays the default suffix if the wizard provides one. Change-Id: Ia1c8966e7de14b484d065dbd4a41aa74f484f085 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-03-097-173/+114
|\ \ \ | |/ / | | | | | | Change-Id: I24afa28063713e8430a049024700ce2905de5c83
| * | QmlDesigner: Remove remaining separate edit 3D window codeMiikka Heikkinen2020-03-095-138/+0
| | | | | | | | | | | | | | | Change-Id: I3d745b54ae3aa5c3c05c859239934125b9ca828d Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * | QmlDesigner: Fix 3D edit view refresh issuesMiikka Heikkinen2020-03-062-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iddcd54b29376a6a31a0290b234ade63ed2bb898b Fixes: QDS-1746 Fixes: QDS-1738 Fixes: QDS-1742 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | QmlDesigner: Fix various Edit 3D view tool state issuesMiikka Heikkinen2020-03-063-28/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit 3D view tool state is now inherited from the current tool state of the 3D view for newly added scenes. If there is a stored tool state for the scene id, then that is used instead. Change-Id: I4360d034cf946b1951642f4c2e09344b34825dc2 Fixes: QDS-1730 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-03-0623-467/+117
|\ \ \ | |/ / | | | | | | Change-Id: I04d9cc69a07d4d07b1bf1df57681d6a68587d7ba
| * | ADS: Adapt Essentials preset layoutHenning Gruendl2020-03-051-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | Adapt Essentials preset layout so it will look like before ADS was introduced. Change-Id: I08ea0cbac41f2de53a3c62c032494e219963bada Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * | ADS: Cleanup workspace manager workflowHenning Gruendl2020-03-052-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add workspace presets - Add reset button to workspace manager - Fix last workspace settings save/restore - Move functionality from DesignModeWidget to DockManager - Remove factory default workspace - Cleanup a few if statements Task-number: QDS-1699 Change-Id: I282dd6162a5a36041f8cd2aacd7407750d54cc22 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * | QmlDesigner: Remove the standalone view3D window implementationMahmoud Badri2020-03-0518-462/+12
| | | | | | | | | | | | | | | | | | Task-number: QDS-1692 Change-Id: I6c04aaee9ab6a119cfcc22ee2e19b808bb95ae0a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * | QmlDesigner: ColorEditor Fix and TooltipsAleksei German2020-03-052-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | - Fixed an issue with not-clickable recent color button - Added tooltips with color hexes for recent and original colors Change-Id: I21c2e4c98005b473a3450606eb27428977578bdc Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * | QmlDesigner: Fix 5.15 buildMiikka Heikkinen2020-03-051-2/+1
| | | | | | | | | | | | | | | | | | | | | QtQuick3D Type API changes broke build. Change-Id: Ibbd7fc3f699875b24f6345dfca66c5f442915544 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-03-0452-1303/+1715
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/cmakeprojectmanager/tealeafreader.cpp src/plugins/cmakeprojectmanager/tealeafreader.h src/plugins/projectexplorer/miniprojecttargetselector.cpp Change-Id: I88d85be3903f57a55fddb7901e771a4822db1b85
| * | QmlDesigner: Port Edit 3D View to 5.15Miikka Heikkinen2020-03-0432-226/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 5.15.0 is now the minimum version to enable Edit 3D view. Change-Id: I15cee59e6a7665477825caa0ae412fc6ac7b570a Fixes: QDS-1694 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * | QmlPuppet: Initialize InputEventTypeTobias Hunger2020-03-031-1/+1
| | | | | | | | | | | | | | | Change-Id: Ic0871aff4658a388f803a90abd722f34a522c68c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * | Dumper: avoid redundant labelingDavid Schulz2020-03-029-236/+220
| | | | | | | | | | | | | | | | | | | | | Change-Id: I85581cfe34a60e7f8a3e3590358443a15b7d2d4c Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
| * | Dumper: remove unused importsDavid Schulz2020-03-022-3/+0
| | | | | | | | | | | | | | | Change-Id: I447c9697dbd631ab26358c193c274484e70a908d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * | QmlDesigner: Implement usage of qtForMCUs propertyThomas Hartmann2020-02-286-3/+40
| | | | | | | | | | | | | | | | | | | | | | | | If qtForMCUs is set in the qmlproject file we disable unsupported properties like roation, transformOrigin or layer. Change-Id: I75d9677beca3d4ce71f975b4f0ae75e63967d143 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | Handle the case when there is no 3D Nodes in the qml docMahmoud Badri2020-02-282-52/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there is no 3D node in the qml doc, the view 3D will still be enabled and manipulate-able. Also few relevant tweaks. Task-number: QDS-1693 Change-Id: I758f783108b317a6971703bee8e3fb564400ed8b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | Dumper: unify CodestyleDavid Schulz2020-02-2813-830/+1209
| | | | | | | | | | | | | | | | | | | | | generated with autopep8 and the introduced setup.cfg Change-Id: I5b55a7937f2cde81be59d2b434e94ada1a4af5ab Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | | "New Class" wizard: Try to find a base class headerChristian Kandeler2020-02-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the project has a header file whose name suggests that it might declare the base class, then add an include statement for it. While we cannot guarantee that the include statement is resolvable as- is, it's at least a basis for the user to adapt accordingly, while without any include statement the class will definitely not compile. Fixes: QTCREATORBUG-3855 Change-Id: I55ec43d58a9a13b9b59a5bbe6415a457b974b654 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-02-277-33/+32
|\ \ \ | |/ / | | | | | | Change-Id: I4523ea36332772a310fd462df55683c93c61bb18
View Lorry Controller Status