Commit Graph

6444 Commits

Author SHA1 Message Date
Christian Kandeler
16e3e44ce7 QmlDesigner: Fix more warnings about unused parameters and functions
Change-Id: I8b569fcf60a0a21c6828d612997bbba0f737c806
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-12-10 17:20:55 +00:00
Orgad Shaneh
49f6b0146a Merge remote-tracking branch 'origin/4.11'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/mcusupport/mcusupportrunconfiguration.cpp
	src/plugins/python/pythonproject.cpp
	src/plugins/qmakeprojectmanager/qmakestep.cpp
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I22507be28fd80c49c9fee0dff5937a40db176a82
2019-12-07 18:39:54 +02:00
Henning Gruendl
60f27c609a QmlDesigner: Add item layer properties
Task-number: QDS-1305
Change-Id: I0d6a390ac05f6bda9f11ecb25b461c95519d8bb3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2019-12-06 13:21:35 +00:00
Henning Gruendl
f4d6300b0b QmlDesigner: Add control for material management
- Create EditableListView for material management
 - Add id list functionality to PropertyEditorValue

Task-number: QDS-1258
Task-number: QDS-1256
Change-Id: I1694648b36845b22f4773ecbd578d77c22c934e2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-06 13:11:30 +00:00
Christian Stenger
2375dcab67 Wizard: Fix test registration to ctest
Change-Id: Ia30cdf1ce690a2ebbc2e991e4e3f8a029e4768ed
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-12-05 11:55:16 +00:00
Miikka Heikkinen
f021680513 QmlDesigner: Fix selection box size calculations
Selection box for zero size items ended up being infinite, which broke
some functionality like fit to camera. Now boxes should be correctly
zero sized for non-model items. This also fixes issues with parent
box size if it has zero size children.

Change-Id: I3c8fae3ee971fbb0cf9e0de2615c107ce97a76f8
Fixes: QDS-1287
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-04 14:24:53 +00:00
Miikka Heikkinen
0758b58ceb QmlDesigner: Fix planar scaling randomly setting the third axis to zero
All the math before checking if the scaling axis is zero can cause
enough rounding errors to make qFuzzyIsNull to not think the value is
zero anymore, so check increase the check range.

Change-Id: I776d44886f061be6c1fd91c09eb8efcfb29e0936
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-04 09:54:37 +00:00
Miikka Heikkinen
4ce7f39e4e QmlDesigner: Fix 3D edit gizmos orientation and rotation order
When selected node has non-default rotation order or orientation,
gizmos need to account for that.

Change-Id: Ie3817fd057b43f708ac1feea3e98e1e44f56d66a
Fixes: QDS-1290
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-04 09:54:26 +00:00
hjk
d61773fa25 QmlDesigner: Suppress warnings if Quick3D is not used
Amends d076c59429.

Change-Id: I3cba673b7cdd4e99541581008bedfb6d0d333339
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2019-12-04 09:01:04 +00:00
Nikolai Kosjar
26b34a0cd4 Debugger/Dumper: Fix dumping CPlusPlus::Token
Change-Id: I368f5227ecb675a653f65d76e83622305390b5ff
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-12-04 07:38:01 +00:00
Miikka Heikkinen
73d3df7908 QmlDesigner: Make imported models selectable
Import creates an opaque Component, which can contain one or more
pickable models. We mark all instanceless models pickable according to
the parent instance pickable status and specify the parent instance
as the pick target using a dynamic property.

Change-Id: I05b96ee48eb8f246c50b2254d620b621e2437aa5
Fixes: QDS-1282
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-03 08:44:30 +00:00
Mahmoud Badri
de141661df Do not zoom camera when changing view
When changing the view by clicking the axis helper, maintain the
current view camera zoom

Task-number: QDS-1274
Change-Id: Icb502bd70da1e6348be90a52885366393ea072c6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2019-12-03 07:54:09 +00:00
Mariana Meireles
5767a097e7 Add Qt for Python templates
Qt for Python
* Add files with basic statements to execute a QApplication using ".ui" files
* Add files with basic statements to execute a QtQuick application

Task-number: QTCREATORBUG-21824
Change-Id: I6e69d82f2a6ba9c67ede96b36ecf4421f30f169f
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-29 14:25:46 +00:00
Miikka Heikkinen
8ff52e37a7 QmlDesigner: Implement multiselection for edit 3D view
Multiselection works in 3D edit view with ctrl-click just like it
does on the Design Studio.

Change-Id: I266f2de11758bed064f44dd97cd79189e3e1f831
Fixes: QDS-1265
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-28 14:43:49 +00:00
Thomas Hartmann
880ab11e76 QmlDesigner: Use proxy dialog for 3D edit view
To integrate the 3D edit view in the qml2puppet process,
we create a dialog in the Qt Creator process.
This dialog acts as a proxy that manages the actual window.

For this I introduced a new command that allows showing, hiding, resizing
and moving of the 3D edit view.
The 3D edit view always follows the proxy dialog.

During moving and resizing we hide the window to avoid artefacts.

At this point in time the proxy widget is a dialog, but it could
also be a dockwidget or any other QWidget in the future.

Task-number: QDS-1179
Change-Id: I67ccab49eb2de9ba23098a67b2f9577f6c7fd3ac
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2019-11-28 13:09:51 +00:00
Eike Ziller
6fc85b49fa Merge remote-tracking branch 'origin/4.11'
Conflicts:
	src/plugins/designer/codemodelhelpers.cpp

Change-Id: I78906f2fbbfd27d254589a272ebca423b0b80699
2019-11-28 08:24:10 +01:00
Aleksei German
6b1d54421e QmlDesigner Removed some debug output
Change-Id: Iaa03c5783cc76b94364eda184d439024c35c4102
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-27 16:30:51 +00:00
Henning Gruendl
2ebffd3eaf QmlDesigner: Fix RealSpinBoxInput
Fixes RealSpinBoxInput scroll behavior. Without this change the
RealSpinBox would block the ScrollView from getting mouse wheel events,
which means whenever the mouse is hovering over a RealSpinBox the
ScrollView can't be scrolled via the mouse wheel.

Change-Id: I4533e36700fc2652a9c246a0e30613c71258edaf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-27 15:12:09 +00:00
Mahmoud Badri
8e2ef36e60 Implement 3D edit view top controls UI
Implement global/local, projection type, and default light controls UI.
Also small tweaks:
- Fixed ortho. camera near clipping
- Grid color darkened a bit
- Selection rect color changed to yellow

Task-number: QDS-1250
Change-Id: I03cf2023ee1b8a6a0768e4dbf7d6fee621a25ce2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-26 13:42:30 +00:00
Henning Gruendl
bec91cbad8 QmlDesigner: Fix editable ComboBox popup selection
This patch introduces a new state called 'popup' to disable text editing
while the popup is opened and enables text editing whenever the popup is
closed.

Task-number: QDS-1262
Change-Id: I74ad4723d2cfe81447e94c37e9ba1f0913790d97
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-26 10:48:30 +00:00
Miikka Heikkinen
05bb285b0d QmlDesigner: Offset move/scale gizmo label in screen space
Offsetting in scene space resulted in label being inconsistent distance
away from the object, depending on zoom and angle.

Change-Id: Ief555de664c042bb1a5c93af0ee7e5a1c3e7ce0a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-11-26 10:37:01 +00:00
Miikka Heikkinen
d076c59429 QmlDesigner: Block selection of hidden objects
If eyeball is turned off for object, it shouldn't be pickable in
3D edit view.

Change-Id: Ib9308aaaecc822f448591f249bd96ffb5d0c9c48
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-26 10:36:51 +00:00
Miikka Heikkinen
f9c1795d3b QmlDesigner: Add UX approved gradient background to 3D edit view
Change-Id: I18b976324f57cf559a43d9ff239796cf25b3cb2f
Fixes: QDS-1202
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-25 15:01:28 +00:00
Henning Gruendl
f80b676e4a QmlDesigner: Fix sticky popups
Task-number: QTCREATORBUG-23102
Change-Id: I53a2abc67221b714e2b4ff7d09045f0b817b59d2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-25 09:38:22 +00:00
Miikka Heikkinen
6ee83b4c19 QmlDesigner: Center on selection box when fit tool is used in 3D Edit
Instead of centering edit camera on selected object, center it on
the selection box, which includes child objects.

Change-Id: I7315a4bcfffc74e72a2b21d0a04fc99ee9f4f3c3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-11-25 08:48:08 +00:00
Miikka Heikkinen
389f96b0ee QmlDesigner: Implement group selection boxes in 3D edit view
Object's selection box now includes the bounds of all of its
descendants. Selection boxes of immediate children of a selected
object are also drawn.
Individual/group selection buttons also now work as expected.

Change-Id: Ice7ef9a536e32c6bb6da70fe23bf0a38e72c14f8
Fixes: QDS-1210
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-22 14:02:48 +00:00
Miikka Heikkinen
9dac42f153 QmlDesigner: Implement fit selection button in 3D edit view
Shortcuts for scale and move were also updated to correct ones.

Change-Id: Iffcad0c81475553003962e65dc059879a237546e
Fixes: QDS-1235
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-22 14:02:32 +00:00
Miikka Heikkinen
c7120bde92 QmlDesigner: Implement axis helper on 3D edit view
Axis helper shows up on top right corner of 3D edit view.
Clicking on axis helper arms zooms camera on that side of the selected
object.

Change-Id: Ibd81a933036f7965f825e3dc97ad7156da62e14c
Fixes: QDS-1205
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-22 13:57:43 +00:00
Miikka Heikkinen
7a46dc620e QmlDesigner: Fix build error
Change-Id: I53d425d0b6f4e66c09bd988bd188218cbf51a99c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-11-22 11:11:22 +00:00
Miikka Heikkinen
0b510f173e QmlDesigner: Implement selection box to 3D edit view
Change-Id: Ib0b13ecd7946e3b7da8ed06d4f5965e06e51a152
Fixes: QDS-1210
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-22 10:48:48 +00:00
Miikka Heikkinen
dbfdacecf4 QmlDesigner: Fix issues with MouseArea3D deactivation detection
Existing mouse grab is now released when MouseArea3D is deactivated
or set to no longer grab the mouse. Various gizmos were also set
to follow MouseArea3D's dragging property instead of keeping track
of drag themselves.

Change-Id: I49f968f20b26eb222fc8635b943e9144073fb164
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-22 10:48:35 +00:00
Miikka Heikkinen
3dd5e089b1 QmlDesigner: Add UX approved light icons for 3D editview
Light icons have a color overlay that indicates light color.

Change-Id: I5f6d80f63d0916dd7cb7b2d5345d586aacd550ef
Fixes: QDS-1209
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-22 10:48:22 +00:00
Miikka Heikkinen
4c73b4629c QmlDesigner: Some fixes to edit 3D after UX review
- Slightly larger cam plane rotate ring to avoid overlap
- Scale tool is always local
- Little more transparent and borderless light/cam icons when selected
- Center light/cam icon on the object

Change-Id: Icb24d89fb3ea852b139677aebe797881a12e474a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-22 10:48:08 +00:00
Miikka Heikkinen
77cb514a79 QmlDesigner: Implement better camera navigation in 3D edit view
Edit camera is now controlled as in Qt 3D Studio:
ALT + left button orbits camera.
ALT + middle button pans camera.
ALT + right button zooms camera.
Wheel zooms camera.

Task-number: QDS-1206
Change-Id: Ia72644073d172b00483ceed8bcc5ffb8dce68741
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-22 10:47:42 +00:00
Eike Ziller
4e6142c932 Merge remote-tracking branch 'origin/4.11'
Conflicts:
	src/plugins/autotest/testresultspane.cpp
	src/plugins/cmakeprojectmanager/cmaketool.cpp

Change-Id: Iade695ac9cab8bf3e3a1abd6e2c71f4a19132ac0
2019-11-21 22:18:35 +02:00
Sergey Belyashov
35321d82e4 Update Russian translation
Change-Id: Idb0d3ab7aaf49cb050e246ec8324ab2c1add8057
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
2019-11-21 12:42:30 +00:00
Miikka Heikkinen
49f7cfb7a1 QmlDesigner: Implement proper helper grid for 3D edit view
Change-Id: I9e33218d4b1528610155c5fb9bf94a9597ee23df
Fixes: QDS-1204
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-18 08:40:00 +00:00
Miikka Heikkinen
db54919798 QmlDesigner: Finalize camera visualization in edit 3D view
Added the UX approved camera icons, which will now turn transparent
and ignore mouse events when camera is selected so they do not
interfere with transform gizmos. Frustum visualization also changes
color according to selection state.

Change-Id: Id77066d9abb2b54696fae833201236afa238486a
Fixes: QDS-1208
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-18 08:39:38 +00:00
Miikka Heikkinen
20257e1e4f QmlDesigner: Implement RotateGizmo for 3D edit view
Added a gizmo for rotating selected object either freely or locked
around X, Y, Z, or camera axis.

Change-Id: Ib43c7dd3fc0f49f384d5920fce21ea932c4fc90d
Task-number: QDS-1196
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-18 08:39:16 +00:00
Christian Stenger
61fa3e8704 Wizards: Fix Qt Quick2 Extension wizard
Show kits selection page already while configuring
the project via wizard instead of falling back
to the target selection after the project had been
opened.
Regression with 6c9f75ff4a.

Change-Id: I9bf70f306dde3a570ab4ca3e4380040d6c6e4e23
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-11-15 12:00:10 +00:00
Henning Gruendl
a48497d663 QmlDesigner: Fix filename spelling in qrc
Change-Id: I90fb27156d51ad5160b57ea476017a17dc757043
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-11-13 10:50:49 +00:00
Aleksei German
5bb0298f69 QmlDesigner Add Binding Editor support to States
Change-Id: I3ccce5e2bfbbfa0dfba1e438d527fa18348005b5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-13 10:24:54 +00:00
Henning Gruendl
d9981135c1 QmlDesigner: PropertyEditor TextSection cleanup
Change-Id: I042f38303aad016d939a39c7a638d330fca2ba58
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-13 10:14:42 +00:00
Mahmoud Badri
8722836b44 Implement EditView3D's toolbar
Move and scale shortcuts are temporarily set to (M) and (T) instead of
(W) and (R) to avoid interference with the WASD RF controller

Task-number: QDS-1201
Change-Id: Ia7ebb6c0d39880be6b87b12d0a4a1d16638fd141
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-13 10:12:33 +00:00
Thiago Macieira
5390607019 Add QDataStream operators for ValueModifiedCommand
Qt 6 does not accept implicit downcasts.

Change-Id: Iad959315ad374ef288f5fffd15d68b67304880cd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-13 10:05:59 +00:00
Christian Stenger
bcde926257 Debugger: Stop cleanly after post mortem debugging
..instead of trying to start over. Starting over may work
but may also end up in strange issues which must get
handled on the user site otherwise.
Especially relevant for pyside projects that are using
QApplication and similar where the old application
instance has to be destroyed before another one can be
created.

Change-Id: I6af132da8499ef4ed983491cdc423fa73ea9ba32
Reviewed-by: hjk <hjk@qt.io>
2019-11-13 05:42:19 +00:00
Lucie Gérard
a6ad0cfff7 Correct generation of header file for translation
Change-Id: I5571b14dfb438c5caaa211308b9255c61959e5de
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-11-12 14:17:25 +00:00
Christian Stenger
49930aa5f9 Debugger: Improve pdb debugging
When a script used __file__ to refer to other
files by constructing relative paths it ended
up trying to use a file relative to the pdbbridge
instead the original python file.
Fix this by bringing the bridge closer to the
original pdb code.

Change-Id: I22dda440c78349bfd3dcf4ce748042cc77eb4bee
Reviewed-by: hjk <hjk@qt.io>
2019-11-12 12:36:45 +00:00
hjk
0120e462b2 Partial compile fix for current Qt dev and/or Qt 6
This does not cover Utils::MapReduceOption with QVector, and code
that's not compiled on my machine.

Change-Id: Ib63923985c52b1bb74e5ec2068a2bb37469ac618
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-11-12 10:50:51 +00:00
Eike Ziller
817f81cbfd macOS: Force shell to a supported shell in Terminals opened from Qt Creator
The whole logic (setting up environment, run interactive or non-interactive shell)
is specific to the shell. So force Terminal to use one of the supported ones.
Currently that is zsh and bash.

Fixes: QTCREATORBUG-21712
Change-Id: I83057dd92c5c976f9f5d6f4faf0f596a75d58293
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-11-12 10:29:31 +00:00