Commit Graph

6086 Commits

Author SHA1 Message Date
Miikka Heikkinen
6eee8aa99d QmlDesigner: Add 3d axis colors to theme
Task-number: QDS-2404
Change-Id: I16f9deb7ba6698adafdd1cc0c8bec868731e1aa8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-11 06:55:09 +00:00
Christian Stenger
c6c320a6ea Debugger: Avoid decoding error when fetching native value
Change-Id: I4cfe144c7d96134e373e6d6d6141eb05a7dfe911
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-10 07:22:02 +00:00
Miikka Heikkinen
32f71ca8ff QmlDesigner: Fix group selection for 3D scenes that have Models as root
Change-Id: If6ec2bcb4a4627fcf658e23f6998115a68718ee8
Fixes: QDS-2467
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-08-07 10:56:53 +00:00
Miikka Heikkinen
a774890a10 QmlDesigner: Fix default transformMode setting in 3D edit view
Change-Id: Ia918d05bf58d9460e25e9fa4dd592c68c03bd0cf
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-08-07 10:55:31 +00:00
Miikka Heikkinen
5343490eb4 QmlDesigner: Fix pivot point scaling
Now pivot point in 3D edit view will always appear same size regardless
of the viewing angle.

Change-Id: Iddd4fc8800eecbc63f16fc130b7f93dcba4d5d65
Fixes: QDS-2570
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-07 07:27:13 +00:00
Miikka Heikkinen
d56d03e322 QmlDesigner: Don't highlight EditableListView items when not focused
Change-Id: I0897d57ad417f39fb72c6ce19c1349f8f6030c0b
Fixes: QDS-2416
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-08-06 14:29:51 +00:00
Henning Gruendl
52f971ce5e QmlDesigner: Fix StatesDelegate TextField size
Task-number: QDS-2572
Change-Id: I0b797724ce626870921649807246ec692c7c40d3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-05 11:39:44 +00:00
Miikka Heikkinen
4d45e2defe QmlDesigner: Fix 3D overlay object colors
Recent changes to Quick3D changed how NoLighting materials work.
Emissive color no longer has effect in that case, so use diffuse color
instead.

Change-Id: Idde43f5bdf06a432a5dd06f9c52d6812fa790a73
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-08-04 10:51:58 +00:00
Henning Gruendl
9f2bb4abaf QmlDesigner: Fix ExpressionTextField popup
Fix the ListView/Popup which is shown on the ExpressionTextField when
requesting auto completion.

* Fix key behavior of the auto completion list
* Adapt to the look and feel of the property editor
* Fix size and position of the TextField and the overlayed Label

Task-number: QDS-2561
Change-Id: Ie8df6a2960b1c273600543532f0a136eb0c542b5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-03 12:57:01 +00:00
Henning Gruendl
1fb1e829ee QmlDesigner: Replace alias icon with font icon
Task-number: QDS-2559
Change-Id: Ibcc4c6565eff6a5c5f7011fbf39af2277da9eec0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-03 12:54:12 +00:00
Christian Stenger
57c6a32b10 Dumper: Fix dumping of enum values for cdb
Fixes the Bitfields test.

Change-Id: I2aab020f1dc8be40ab994586d0989452c80bb8e3
Reviewed-by: hjk <hjk@qt.io>
2020-07-31 13:09:02 +00:00
Henning Gruendl
2fa261c132 QmlDesigner: Move zoom buttons to FormEditorWidget
* Move the zoom all and zoom selection button to the FormEditorWidget
  taskbar
* Add zoom in and zoom out actions/buttons
* Fix ZoomAction in and out direction
* Add update icon font

Change-Id: I9addba5652cafa5884450bc633a1e16087aae8dd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-10 13:00:18 +00:00
Henning Gruendl
c898152621 QmlDesigner: Add change type name dialog
* Add a change type name dialog showing all incompatible properties
* Fix ExpressionTextField triggering twice on pressing enter
* Fix compare operator

Task-number: QDS-1946
Change-Id: Ic384f6dcce44297b43839c17874108b39af909da
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-10 10:10:02 +00:00
Henning Gruendl
58ea14aea7 QmlDesigner: Controls 1 cleanup
* Replace ScrollView Controls 1 with ScrollView Controls 2
* Replace TabView with TabBar and StackLayout
* Remove unused styles
* Replace Controls 1 imports
* Remove print statement in FontSection
* Fix layout width by correcting CheckBox width
* Remove TabView from QtObjectPane

Task-number: QDS-2454
Task-number: QDS-2455
Task-number: QDS-2456
Change-Id: I913d326afb012375dd5b804171cb8cd67681514c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-10 10:09:48 +00:00
Christian Kandeler
782ca5d8d8 Clang: Fix error when including float.h with mingw
Prevent mingw from trying to #include_next a private header from a path
we cannot add to our list of includes.

Fixes: QTCREATORBUG-24251
Task-number: QTCREATORBUG-24027
Change-Id: I18a9db130b9c2265cd208c3506d08d2e1c4cee45
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2020-07-09 17:24:16 +00:00
Robert Loehning
ddd9158b03 German translation: Avoid ambiguous shortcut overload
D clashes with "Datei".
E clashes with "Erstellen".
B clashes with "Bearbeiten".
U clashes with "Auswahl in Kleinschreibung wandeln".
G clashes with git shortcuts

Change-Id: I2d13eb45f73847526b896420510bdba196949787
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2020-07-09 09:05:14 +00:00
Christian Kandeler
53b4d6975d C++: Fix highlighting Q_PROPERTY with template types
We override the Q_PROPERTY macro in our own header. This appears to have
two effects:
  1) The macro arguments are properly highlighted.
  2) There is no completion from libclang for Q_PROPERTY, meaning our
     own helpful snippet is the only completion candidate.
I don't understand the reason for either of these; they seem to be more
or less random effects of parsing peculiarities.

As it turns out, our macro redefinition breaks if the type of the
property is based on a template class, leading to false errors in the
code model. Removing our macro redefinition fixes the code model, but
also removes the aforementioned effects. Turning the macro into a
variadic macro fixes the code model and keeps effect 1), but not effect
2). Therefore, we also update the snippet to provide an extra string
that makes it clear this it's a helpful snippt, rather than just a
normal completion.

Fixes: QTCREATORBUG-24243
Change-Id: I4044d5e633af3ebdba36032d5efd3333b5a36214
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-07-08 14:41:11 +00:00
Miikka Heikkinen
b508a98e6a QmlDesigner: Fix spinbox empty value handling
Force zero value when text value converts to NaN.

Also, onEditingFinished doesn't trigger if value is something not
accepted by the validator (the empty value), so do the equivalent
also on focus loss, if value is still dirty (meaning onEditingFinished
didn't happen). This ensures we're never left with different value
shown and written in qml file.

Change-Id: I3862d8d11adf7955f99b50b515e015ad132a5c78
Fixes: QDS-1539
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-08 08:41:36 +00:00
Eike Ziller
b18711da91 Merge remote-tracking branch 'origin/4.12' into 4.13
Conflicts:
	share/qtcreator/debugger/lldbbridge.py

Change-Id: Ia444f6424fb35b9a539e157afcee868161535272
2020-07-06 16:23:13 +02:00
Thomas Hartmann
c16de88a12 QmlDesigner: Remove Controls 1 dependencies
Change-Id: I085d24265669c55777e0c63b5f6fb26a8d0fe631
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-06 13:03:42 +00:00
Andre Hartmann
c9eedbe0f3 Git: Port colorful log to text colors
Fixes: QTCREATORBUG-24198
Change-Id: Icde06da5ac848fb0f7faf02a8e55fb26136f318c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-07-06 10:55:43 +00:00
Orgad Shaneh
e3312205ed Dumper: Adapt to Id that moved from Core to Utils
Change-Id: I6437d813234dc22923a313d540f115e070edeba7
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-07-06 09:37:21 +00:00
Eike Ziller
d0e3f5ca98 Fix debugging C++ on iOS devices
Partially revert 7f958700a0 for 'remote-ios'.
The original commit changed the way attaching to a remote server or process
works, attempting to make it work with lldb-server on a remote linux device.
That breaks connecting to the debugging server on iOS devices.

Fixes: QTCREATORBUG-23995
Change-Id: I7a793fa73a564a4ef19cf82e13c2ad50d4247ee3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-06 09:18:40 +00:00
Thomas Hartmann
b978af12ae QmlDesigner: Remove ExtendedFunctionButton
Change-Id: Ia8b7933ccb9b33d5d09b2a7edd862937246d97d8
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-07-06 07:16:30 +00:00
Thomas Hartmann
d1e21dd615 QmlDesigner: Remove custom controls 1 styles
Change-Id: I695813e7b97caf7355211550856e51a398566ae9
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-07-06 07:16:04 +00:00
Thomas Hartmann
98f84cd539 QmlDesigner: Remove GroupBox
This is unused.

Change-Id: If128fe35d6dd925cd4ff4999b2050e61325230da
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-07-06 07:15:46 +00:00
Miikka Heikkinen
fccc02de96 QmlDesigner: Allow starting free drag on initial selection press
Changed object selection to be done on press instead of click, and
the initial press now also starts free drag of the selected object
after a short distance moved to prevent accidental drags.

Change-Id: I61656661cd734d167ef9f8db42d986f0e97402a3
Fixes: QDS-2376
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-07-03 11:35:49 +00:00
Orgad Shaneh
00e814fdd1 Debugger: Respect "Use Dynamic Object Type for Display"
Broke in 5efa84830b.

Task-number: QTCREATORBUG-24280
Change-Id: Ice4b9d826d2402efb354180886d35926a2513e5a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-03 09:07:46 +00:00
Christian Stenger
5b4b09481a Wizards: Improve python class wizard
Some minor fixes, simplifications and improvements.
In detail:
 * create valid Python code
 * allow creating a Python class also without a Qt package
 * hint about the need for a Qt package depending on the
   base class
 * remove QDeclarativeItem as base class as this is not
   present in recent Qt packages

Change-Id: I7198f315b3a9eec9a04f52d7438d05ccce40c3f7
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-07-02 06:58:51 +00:00
Assam Boudjelthia
560f5bfdc7 Android: update to latest SDK cmdline-tools
Also, add the --sdk_root argument which is needed.

Change-Id: I85f9444b35bb31aed9670bd322f2754061cf70c6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-07-01 13:26:44 +00:00
Eike Ziller
5a97e8ceb9 Merge remote-tracking branch 'origin/4.13'
Conflicts:
	src/plugins/android/androidsettingswidget.cpp

Change-Id: Iadf1d58a1e867ae7bb2dca55d3951613cfcc3d07
2020-07-01 09:01:26 +02:00
Christian Kandeler
59b84c8d19 Wizards: Update templates in regard to deprecation warnings
The QT_DEPRECATED_WARNINGS macro has no effect anymore, so let's remove
it along with the huge chunk of comments that took up an inordinate
amount of space in the resulting project file. The concise comment for
the QT_DISABLE_DEPRECATED_BEFORE macro is perfectly sufficient.

Fixes: QTCREATORBUG-24244
Change-Id: I549c16c2c037bb64c2833e4807047ab3a8b2103f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-30 12:13:41 +00:00
Miikka Heikkinen
38ded4ffea QmlDesigner: Turn the 3D edit light on initially for lightless scenes
Change-Id: Ib840adec751604f08b5135b3e3088b7ce663685a
Fixes: QDS-2316
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-06-29 13:30:07 +00:00
Henning Gruendl
7f0a0d2c60 QmlDesigner: Property Editor cleanup
* Put align distribute section in separate file

Change-Id: I8f0219f32f847c11733833164c5287af5df429cd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-29 10:35:16 +00:00
Miikka Heikkinen
85bcae2c38 QmlDesigner: Handle active scene id change properly on edit 3D view
The scene id shown on the corner of edit 3D view is updated and
toolstates are also stored under the new id.

Change-Id: Ib3ac2f2bb829a5d908e22932c313c76bd4143592
Fixes: QDS-2277
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-06-29 10:19:45 +00:00
Henning Gruendl
ddde374b40 QmlDesigner: Set height according to active tab
* Add binding to current tab height
* Remove unused specficsOneHeight statement

Task-number: QDS-2051
Change-Id: Ia1ac6af4e65d3de5e1db96f2bcc2d1ec8eb08312
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-29 10:15:16 +00:00
Miikka Heikkinen
ba942583b8 QmlDesigner: Update 3D edit view on state change
Change-Id: I56b16afe4d9ccab802d6e07f60b57e46a353cc26
Fixes: QDS-2378
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-06-29 10:06:55 +00:00
The Qt Project
1f1dca9ec7 Merge "Merge remote-tracking branch 'origin/4.13'" 2020-06-29 07:31:44 +00:00
Tobias Hunger
c0bbbc2f70 Wizards: Update CMakeLists.txt files to handle Qt 6 and Qt 5
Update wizards to produce CMakeLists.txt files that can work with both
Qt 5 and Qt 6.

Bump minimum CMake version to 3.14 since that is the first version that
accepts Qt with major version 6 in AUTOMOC/AUTOUIC.

Task-number: QTCREATORBUG-24206
Change-Id: I2ff462e67f01d84939c02be579579f358bc0b20e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-06-29 07:29:31 +00:00
Eike Ziller
40a14070d3 Merge remote-tracking branch 'origin/4.13'
Change-Id: Ie67085fcbb4150c60f0253312e19a82b95b4a898
2020-06-29 09:01:31 +02:00
The Qt Project
018e4aa197 Merge "Merge remote-tracking branch 'origin/qds-1.59' into 4.13" into 4.13 2020-06-29 04:38:48 +00:00
Tim Jenssen
b8cd87dea0 Merge remote-tracking branch 'origin/qds-1.59' into 4.13
Conflicts:
	src/plugins/clangformat/clangformatplugin.cpp
	src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
	src/plugins/qmldesigner/qmldesigner.qbs

Change-Id: Ie4a0beeb9fd32ac9683f4e8769988a9c3f3e369a
2020-06-26 16:51:22 +02:00
Michael Weghorn
70c4889ac9 Debugger: Show text representation for 'char *' typedefs etc
'tryPutSimpleFormattedPointer' takes care of nicely
showing the actual string representation of character
arrays if the innerType is one of 'char', 'signed char',
unsigned char', 'CHAR'.

To make this work for typedefs of those types as well,
first resolve the typedef before passing the value to
'tryPutSimpleFormattedPointer' from 'putFormattedPointerX'.

This e.g. improves the display of variables of type
'const gchar *'.

Fixes: QTCREATORBUG-24264
Change-Id: I477b6d7552f9c30c12d819aa5f37e64e4f444969
Reviewed-by: hjk <hjk@qt.io>
2020-06-26 14:14:23 +00:00
Artur Shepilko
1522dc98c1 Qmlpuppet: Remove an explicit bool type for fitAndHideBox() function
Explicit return values in qml functions cause errors in some Qt
versions, so remove the need for it.

Change-Id: Idd3035b19b56c25e94bc846c3de8f7aa5381e1eb
Reviewed-by: Artur Shepilko <artur.shepilko@nomadbyte.com>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-06-26 13:57:15 +00:00
Miikka Heikkinen
2949504a9d QmlDesigner: Fix draggable priorities in 3D edit gizmos
Upped default priority of all directional draggables a bit to make
them preferable to free rotation ball.

Change-Id: If934cb723e8c1a8ca9a114d71b19cbfc196e2682
Fixes: QDS-2286
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-06-26 13:56:52 +00:00
Thomas Hartmann
cd622fd0a7 QmlDesigner: Reset focus also for objects not derived from Item
Task-number: QDS-2369
Change-Id: Ifa9ce163751bad0de09db5d35f77609210dd0ac5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-06-26 07:59:24 +00:00
hjk
dbca372780 QmlPuppet: Fall back to pre-Qt5.2 for QVariant comparison
Change-Id: Ibf55561e01f50ec7d689d40b50d100b8d257aa80
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-26 07:11:16 +00:00
Thomas Hartmann
003282c6f5 QmlDesigner: Fix crash on puppet
Change-Id: I233d3dab5a509bfd7c9a30c7dcc15dcf8751f456
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-26 06:48:26 +00:00
Thomas Hartmann
a381d8efc8 QmlDesigner: Fix crash on puppet
Change-Id: I233d3dab5a509bfd7c9a30c7dcc15dcf8751f456
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-25 12:02:57 +00:00
The Qt Project
aba5ecb363 Merge "Merge remote-tracking branch 'origin/4.12'" 2020-06-25 08:11:07 +00:00