Commit Graph

5843 Commits

Author SHA1 Message Date
Miikka Heikkinen
2c842453b0 QmlDesigner: Add light meshes to edit 3d view
Change-Id: I996498fde14510fc78c729f56cb8d46b28b233bb
Fixes: QDS-1634
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-03-12 09:06:48 +00:00
Thomas Hartmann
c3fec9e79f QmlDesigner: Enable anchoring only in base state
Change-Id: Ief2670951281ed801a183057acfaa7d3cad2b3f4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-11 12:01:56 +00:00
Thomas Hartmann
a78522a800 QmlDesigner: Add states property
Change-Id: I17162c01c9b54a70a726990510368cc363ccfb38
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-11 12:01:29 +00:00
Leena Miettinen
1f26c6d1b9 Qt Quick Designer: Fix UI text punctuation and capitalization
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>
2020-03-11 08:38:21 +00:00
Aleksei German
0702f65a52 QmlDesigner: Add Default State button
Added functionality to change default state from UI

TASK: QDS-1747
Change-Id: I78c0a5e8f5abfc18b4dbce9e283ceb1307a537ae
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-10 14:41:01 +00:00
Mahmoud Badri
4a11975956 QmlDesigner: Update cullingMode API to QtQuick3D 5.15 specs
Change-Id: Ic4fc6bbd4d2bb7e9968c337eb5775a04c1a6f59c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-03-10 14:01:38 +00:00
Miikka Heikkinen
9abd96e38f QmlDesigner: Fix edit 3D view tool state initialization
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>
2020-03-09 11:58:42 +00:00
Aleksei German
6de4e49646 QmlDesigner: Fix Add State Button spacing
Task: QDS-300
Change-Id: I3c69e9b3871a8879137d25c92cbef3c1a4ae9e8b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-09 11:38:21 +00:00
David Schulz
df2efd7df6 Dumper: raise exception in gdbbridge callHelper on Windows
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>
2020-03-09 09:20:06 +00:00
Miikka Heikkinen
efa11e690b QmlDesigner: Remove remaining separate edit 3D window code
Change-Id: I3d745b54ae3aa5c3c05c859239934125b9ca828d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-03-09 08:41:55 +00:00
Miikka Heikkinen
0fa7581b18 QmlDesigner: Fix 3D edit view refresh issues
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>
2020-03-06 13:30:23 +00:00
Miikka Heikkinen
887b137348 QmlDesigner: Fix various Edit 3D view tool state issues
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>
2020-03-06 13:28:04 +00:00
Henning Gruendl
447171400b ADS: Adapt Essentials preset layout
Adapt Essentials preset layout so it will look like before ADS was
introduced.

Change-Id: I08ea0cbac41f2de53a3c62c032494e219963bada
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-05 13:08:12 +00:00
Henning Gruendl
5683f2df85 ADS: Cleanup workspace manager workflow
- 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>
2020-03-05 11:12:51 +00:00
Mahmoud Badri
fb843d3442 QmlDesigner: Remove the standalone view3D window implementation
Task-number: QDS-1692
Change-Id: I6c04aaee9ab6a119cfcc22ee2e19b808bb95ae0a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-03-05 11:00:11 +00:00
Aleksei German
5b8fe22337 QmlDesigner: ColorEditor Fix and Tooltips
- 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>
2020-03-05 10:33:16 +00:00
Miikka Heikkinen
eadbce7b80 QmlDesigner: Fix 5.15 build
QtQuick3D Type API changes broke build.

Change-Id: Ibbd7fc3f699875b24f6345dfca66c5f442915544
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-05 09:51:41 +00:00
Miikka Heikkinen
a77ef4ca7f QmlDesigner: Port Edit 3D View to 5.15
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>
2020-03-04 06:27:45 +00:00
Tobias Hunger
699d1b974c QmlPuppet: Initialize InputEventType
Change-Id: Ic0871aff4658a388f803a90abd722f34a522c68c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:05:35 +00:00
David Schulz
472797a1d1 Dumper: avoid redundant labeling
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>
2020-03-02 12:14:22 +00:00
David Schulz
d91d4aa759 Dumper: remove unused imports
Change-Id: I447c9697dbd631ab26358c193c274484e70a908d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-02 12:13:34 +00:00
Thomas Hartmann
620e17cf7b QmlDesigner: Implement usage of qtForMCUs property
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>
2020-02-28 15:27:36 +00:00
Mahmoud Badri
55b3d53213 Handle the case when there is no 3D Nodes in the qml doc
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>
2020-02-28 13:19:44 +00:00
David Schulz
0776340ad8 Dumper: unify Codestyle
generated with autopep8 and the introduced setup.cfg

Change-Id: I5b55a7937f2cde81be59d2b434e94ada1a4af5ab
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-28 08:35:05 +00:00
David Schulz
4422805cec Dumper: replace xrange with range
Change-Id: I09b3dd4da548643e927dbc5bb3130c28a746396b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-26 10:26:55 +00:00
Eike Ziller
fa59e02f89 Merge remote-tracking branch 'origin/4.11' into 4.12
Change-Id: I8cc80483cdb10309bf73aba5cfab52c1d90e1bbc
2020-02-26 08:14:47 +01:00
David Schulz
44db8e2eab Dumper: replace import * with explicit imports
Using imports like

 from foo import *

is considered as bad habit and it reduces
static code analysis usability.

Change-Id: I56a175f4c7b231e2b8e486bd9d1c65543720f56a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-25 13:22:50 +00:00
Christian Stenger
5d3e56b3b4 QmlDesigner: Fix compile with Qt5.11 and building tests
Change-Id: I96dea7de0d185c67ea3a26a42de0805bd60dc1d1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-02-24 13:40:07 +00:00
Miikka Heikkinen
4908055937 Integrate Edit3D view into Creator
Edit3D view is now a tab alongside Form Editor.
Buttons were moved to a Creator side task bar on Edit 3D view.

Change-Id: Ia06107e4f855ba512ffea3e628a61558894e800e
Fixes: QDS-1570
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-24 12:18:53 +00:00
David Schulz
e17c96cf11 Dumper: move global enums and functions to utils
Change-Id: I11f5f0d970cd23a5fd907d33daa3cb8a441d0c58
Reviewed-by: hjk <hjk@qt.io>
2020-02-24 07:47:40 +00:00
Andre Hartmann
710836f222 Debugger: Fix std::optional dumper
Tested under Ubuntu Linux 18.04.1
with gcc 7.4.0 and gdb 8.1.

Started-by: Tobias B. on Jira
Fixes: QTCREATORBUG-22436
Change-Id: Id75c817f26bf16e4d93332ab24068cacbe5d9d8e
Reviewed-by: Marcel Petrick <mail@marcelpetrick.it>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-02-23 14:33:45 +00:00
Aleksei German
3f8da54e7d QmlDesigner: Annotation Multiselect
Change-Id: Ia7a84c321d5cd1e2522bf277a903c78ec24ce156
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-20 08:50:59 +00:00
Aleksei German
9a09dd8a88 QmlDesigner: minor fixes for Annotations
- Mac dialog window fix
 - Changed behavior on add new tabs action
 - Removed unused code

Change-Id: I0579b1ba85fb535464b2d5160a85a898f2e78a76
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-19 13:55:35 +00:00
Thomas Hartmann
34f417a2e4 Qml tooling: Support Qt 5.15
...and keep the default at 5.12

Change-Id: I15439c2d71a0610971dc39246e8b98e9653b8f04
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-19 13:22:24 +00:00
hjk
5064bddff6 Work around QLocalSocket::error deprecation
Centralizing does not bring much benefit here, it's just six locations,
and having either a central #include <QLocalSocket> in algorithm.h
or a separe file does not sound better.

In any case, it is absurd, that deprecating functions to "make code
nicer" requires spilling #if QT_VERSION_CHECK over the code.

Change-Id: Ia9a8c0eb6ef7cabbaffb46cfe472247e26e7e2c2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-19 09:57:04 +00:00
Andy Shaw
e22eea1cf3 Fix the Python templates
This fixes the templates so that they do not produce any warnings
and also includes QQuickItem in the choice of base classes

Change-Id: I58bbd462052f5d2a64bb8c4bea5bbdcd15e66700
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
2020-02-18 16:13:20 +00:00
Eike Ziller
bf25c21eb0 Merge remote-tracking branch 'origin/4.12'
Change-Id: I333037e56be7280b86ce577ea63393245c28c09d
2020-02-17 16:47:06 +01:00
Eike Ziller
086b4eef07 Plugin wizard: Enable building against Qt Creator snapshots in github workflow
Change-Id: I36a6ffb878c5bc6a59219424cab5b71bdc12bf33
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-02-17 14:51:04 +00:00
Aleksei German
c81d672bb0 QmlDesigner: QDS Annotations
- Extended Auxiliary data support for Annotations
 - Extended Model Node interface
 - New Tool created
 - Form Editor & Property Editor visualization

Task: QDS-39
Change-Id: Idf15f9b295cb2b977fd5557acffbd40757f13a8e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-17 14:50:17 +00:00
Andre Hartmann
da42176da8 QmlPuppet: Fix unused parameter warnings
Change-Id: I3bd5f921a3ca1f6067fac6e232f383f0b1be5463
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-02-17 13:50:50 +00:00
Thomas Hartmann
2f13a2a029 QmlDesigner: Add property editor sheets for animations
Task-number: QDS-1613
Change-Id: I38bd2274983ec063af625f924f61cfb262e24d1f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-14 15:30:55 +00:00
Henning Gruendl
905db66355 QmlDesigner: Add new icon font
- Set unique family name to avoid clash
 - Add new icons

Task-number: QDS-1578
Change-Id: Ic526d2e015a6372d61241bcf1568cced119ab87a
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-14 12:54:49 +00:00
Miikka Heikkinen
1d71e6ac17 QmlDesigner: Store tool state on per-scene basis
Tool state of the scene is linked to qml id of the scene root, so that
tool states are preserved through delete and undo, which causes
generation of new internal ids for instances.

Tool state storage doesn't currently survive changing of scene root
qml id, as tracking that isn't trivial. It's not enough to simply track
id change commands because model repurposes existing nodes when major
graph changes occur, causing unexpected id changes e.g. when
delete/undo is done.

Change-Id: I74d11ce47e86ce5d29796399c4a91b65980b1597
Fixes: QDS-1536
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-11 12:13:24 +00:00
Mahmoud Badri
159c82802b QmlDesigner: Maintain grid size while zooming
Task-number: QDS-1622
Change-Id: I488b78304866b40b16d17d643816aa899ccb4cd9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-02-10 21:47:06 +00:00
Assam Boudjelthia
f46099d21e Android: Automatically download SDK tools and essential packages
Automatically download Android SDK Tools to default path
used by Android Studio, then essential packages will be installed
using the sdkmanager tool. Automatic installation can also be
triggered by an added button in the settings page.

Essentials packages include NDK Bundle and other NDK versions
required by previous Qt versions.

An sdk_definitions.json file holds download paths for SDK Tools,
and other (Qt version <-> essential packages) combinations.

[ChangeLog][Android] Automatically download SDK Tools, NDKs and
all essential packages for Android builds.

Task-number: QTCREATORBUG-23285
Change-Id: I90e7aafecd017d2bdc959e403711d9d440a6bbb2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-07 18:21:30 +00:00
Mahmoud Badri
76bb4e4c08 QmlDesigner: Implement grid zooming
Grid zooms in and out according to camera zoom so that grid spacing is
neither too condense nor too sparse. Also changed the grid color to be
a bit darker and few other small tweaks.
PS: if the view camera is panned, the grid will not work correctly.
This is due to issues with the camera zoom calculations and is not part
of this commit.

Task-number: QDS-1566
Change-Id: Ib08d5387b028b8d870df9ecf88a5766eae5a509e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-07 10:21:06 +00:00
Miikka Heikkinen
7c992f5450 QmlDesigner: Insert a node dragged to 3d edit view into correct scene
Added scene instance id to the drop command.

Change-Id: I42df07fec823083454ad5a70ccafa318d05ab224
Fixes: QDS-1594
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-07 10:17:47 +00:00
Miikka Heikkinen
ec4e60e691 QmlDesigner: Fix build with Qt 5.14.1
A quick3d private API used was introduced in 5.14.2

Change-Id: I03e48fb79068e16a24b2c2a1e128d59efb6c8fad
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-02-06 12:51:58 +00:00
Miikka Heikkinen
07ada921dc QmlDesigner: Fix camera frustum visualization in 3d edit view
Now camera frustum visualization should always appear correctly in
3D edit view, as the QSSGRenderCamera node is created at frustum
geometry update time if it's missing. Active scene change
also triggers geometry update for camera gizmos.

Change-Id: If24e97490b2ff6607049b5288c6e167aa29a86b2
Fixes: QDS-1472
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-06 08:41:11 +00:00
Miikka Heikkinen
13c6e5df28 QmlDesigner: Support adding/removing/reparenting 3D scenes
3D edit view should now update correctly when 3D Nodes and View3D
items are added, removed, or reparented in the scene.

Deleting the active scene will change the active scene to another
existing scene.

Fixes: QDS-1591
Change-Id: Ib885453574e72f486a236264cc10d88cb872e9c7
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-04 13:22:53 +00:00