Commit Graph

6494 Commits

Author SHA1 Message Date
Orgad Shaneh
e504d96934 Merge remote-tracking branch 'origin/4.13' into master
Change-Id: I8a2dca29595a0770f4162786b15a145f3f4133af
2020-09-04 16:11:12 +03:00
Miikka Heikkinen
5cc7dae965 QmlPuppet: Improve gizmo precision
At high zoom levels, picking precision of the gizmos was not good,
because compounding inaccuracies from multiple floating point
operations required. Fixed by reimplementing many operations using
double precision math.

Change-Id: I013876b816379a20b552eb06d2f9cbb3f2aa2d21
Fixes: QDS-2676
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-09-04 11:58:04 +00:00
Aleksei German
3f99be2ee8 QmlDesigner: Fix for Animation Properties LineEdit
Deactivated an option to translate properties names.

Task: QDS-2737

Change-Id: Ieadd4cd56094f09c961234a5b2790c2380e1106a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-04 09:12:55 +00:00
Aleksei German
f849319d11 QmlDesigner: Disable more properties for QUL
Turned off Controls properties and Animations.

Task-number: QDS-943
Change-Id: I4b9868734c74f5319fd7d3e66b57d59007300340
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-03 16:17:52 +00:00
Eike Ziller
3b76714290 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/MouseAreaSpecifics.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RowSpecifics.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/StandardTextSection.qml

Change-Id: Ie5deacd39ae4f3c0966e7cb41a8fd832dcefbb09
2020-09-03 12:18:02 +02:00
Aleksei German
b11bfd5652 QmlDesigner: Disable more properties for QUL
Disabling more items in ItemLibrary and properties

Change-Id: Ib019c1cbe356e0f7e3889d3500c080b0f5756c34
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-03 08:39:26 +00:00
Orgad Shaneh
fd32b222ee LLDB: Escape strings for correct parsing
Sample broken output:
>result={token="9",lldbid="1",valid="1",hitcount="0",threadid="0",oneshot="0",
condition="",enabled="1",valid="1",ignorecount="0",locations=[
{locid="1",function="foo()",enabled="1",resolved="0",valid="1",ignorecount="0",
file="F:\Projects\test\main.cpp",line="5",addr="4199979"},],
file="F:\Projects\test\main.cpp",line="5"}@

When parsed as GdbMi value, the strings are expected to be escaped.

Change-Id: Idb923516c1cf6e25b970ad08fae977bdf1045b4b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-03 07:39:50 +00:00
Aleksei German
d6da7745fa QmlDesigner: Remove old properties
Removed and replaced old properties for ListView and GridView

Change-Id: Ifbf2aae2958c5f67616d8f6a4acad6646b34c18c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-09-03 06:51:48 +00:00
Henning Gruendl
6d51955451 QmlDesigner: Fix mobile scroll wizard template
Change-Id: I00d0467ce4ed28d0135e16c6ae9802ed66a1ff7d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-02 14:00:34 +00:00
Thomas Hartmann
831a709857 QmlDesigner: Add support for .hdr to UrlChooser
Task-number: QDS-2128
Change-Id: I944a42d36357cbddae6d5cc30178723e62e0656f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-02 10:35:05 +00:00
Sergey Belyashov
53a4d357bf Update Russian translation
Change-Id: Ifdbd70b4f225f8d64d408c9bed695f7e98b81eaf
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Olesya Gerasimenko <gammaray@basealt.ru>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
2020-09-02 03:23:10 +00:00
Aleksei German
84280f0410 QmlDesigner: Compact option for label deactivation
Change-Id: Ie163f4c021212837b703d2615cbf78b953e056ec
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 18:22:34 +00:00
Miikka Heikkinen
893d5901a6 QmlPuppet: Fall back to primitive creation if component creation fails
This ensures components defined in .qml files get loaded properly.

Change-Id: I070132ab5ad58b2531f27f623f218e0ee3565c5b
Fixes: QDS-2697
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 13:47:53 +00:00
Aleksei German
f43b81ae6f QmlDesigner: Disable Properties unavailable in QUL
Disabling properties in:
 MouseArea
 Flickable
 Image
 Text (including Font)

Change-Id: Id0a44fa73ff80bf4749c0bdc0f9eac3e2f488762
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 10:03:53 +00:00
Christian Stenger
e65e4b81ea QmlDesigner: Fix build of tests
Amends b0c47267d8.

Change-Id: I62c8007156a0f9cebdcc83c2f4cef135e19d27e2
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-09-01 09:44:48 +00:00
Marco Bubke
b0c47267d8 QmlDesigner: Inline vector stream operators
Task-number: QTCREATORBUG-24548
Change-Id: I01d1b6e12c04c4ea47279e3a5046a0d3e34a5c09
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 09:10:19 +00:00
Eike Ziller
6477a07654 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/clangtools/virtualfilesystemoverlay.h
	src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.ui
	src/plugins/qmldesigner/designercore/model/abstractview.cpp

Change-Id: I5013bd8fdd28d79cdea74380bec01d4c106adfaf
2020-08-31 14:49:19 +02:00
Henning Gruendl
431667925e QmlDesigner: Update StateEditor layout
* Add alias properties to StudioControls AbstractButton
* Add color to StudioControls theme
* Update StateEditor layout due to issue with default label placement

Task-number: QDS-2623
Task-number: QDS-2615
Change-Id: If46daab2293d42dff7d73c4cf9a0c370442c5694
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-31 07:53:05 +00:00
Orgad Shaneh
53c763029b Dumper: Fix size of refcount member in basic_string
It's an int. Still, the position is 3 pointer-sizes back due to padding
(the next member after this struct is the char pointer).

The pointer-size + bitwise stripping of the LSB probably doesn't work
on big-endian archs.

Change-Id: I4413d9b32986d1ea0be9abe1be4382ee36a9456c
Reviewed-by: hjk <hjk@qt.io>
2020-08-30 10:10:51 +00:00
Henning Gruendl
5a8d4c6fc1 QmlDesigner: Update icon font
* 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>
2020-08-27 10:06:04 +00:00
Aleksei German
f642c02eb6 QmlDesigner: Annotations for States
- Added Annotations support for States

Task: QDS-2312

Change-Id: I204ec958f85bd0f05eae0abbb3848d6d59e7e397
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-08-27 10:05:44 +00:00
Henning Gruendl
d235a6d807 QmlDesigner: Fix focus on EditableListView
* Add an enum to the StudioControls ComboBox to indicate type of
  interaction
* Force focus on last used ComboBox if activated signal wasn't send
  due to editing of the ComboBoxInput

Task-number: QDS-2626
Change-Id: I20b1660a05923baacef30f91080642baacee0378
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-27 10:05:04 +00:00
Eike Ziller
6efb09a86a Merge remote-tracking branch 'origin/4.13' into master
Change-Id: I8b11dad770b37a7f6029ae818c9d92a24818e56d
2020-08-26 13:12:21 +02:00
Orgad Shaneh
29ecf16ed3 Dumpers: Fix string+allocator dumper for old GCC versions
Older versions of GCC headers don't have _M_string_length.

Tested against GCC 4.4.4.

Change-Id: Ib3a025edeb26afce7fd54acfb6e965e64200f024
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-08-26 09:23:27 +00:00
Eike Ziller
00ced26f47 Merge remote-tracking branch 'origin/4.13' into master
Change-Id: Ib60df85a85fc1c94d8cc0dc23ea9fcdb4822bcab
2020-08-25 12:42:04 +02:00
Marco Bubke
7962dbb413 QmlDesigner: Fix CapturedDataCommand
Change-Id: I7dbbce3c071440924550140002d81128befa3404
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-25 08:22:08 +00:00
Eike Ziller
2a05186194 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	CMakeLists.txt

Change-Id: I799060da2cb299bb0c49a3da3530fad18427a23c
2020-08-21 10:08:55 +02:00
Michael Winkelmann
c78f9352d2 QmlPuppet: Fix build error for ChangeLanguageCommand on MinGW
Change-Id: I190097871e1abf6932fdbb93293e189af7809793
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-21 07:15:49 +00:00
Thomas Hartmann
98656b5e61 QmlDesigner: Provide Object3DPane
If the QtQuick3D import becomes before the QtQuick import,
then QtObject is not recognized as a prototype of the QtQuick3D types.

Workaround: provide a pane for Object3D.

Task-number: QDS-2648
Change-Id: I337a30d09233101a8e7b00cc2d145d8211933571
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-20 15:45:09 +00:00
Henning Gruendl
2fe5b9f9b3 QmlDesigner: Add Connections specifics
Change-Id: I161f05c82f8c4114294a9c2609e4e3b50081db61
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-20 10:16:41 +00:00
Henning Gruendl
15296cecc9 QmlDesigner: Fix property editor template layout
Change-Id: Icc4dd3e1e0daabc98dbfd893e0511a4ac6d07b13
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-20 10:16:13 +00:00
Henning Gruendl
5946ff96f8 QmlDesigner: Add State specifics
Change-Id: Ia80688dc056eab190e80344ef4414d1be247c4e5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-20 10:15:35 +00:00
Michael Winkelmann
44a3c092a0 QmlPuppet: Refactor ChangeIdsCommand
Change-Id: I75de863121b66a5050226dd5c8914229cb1af608
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-20 09:33:30 +00:00
Michael Winkelmann
d39a6f656f QmlPuppet: Refactor ChangeFileUrlCommand
Change-Id: I900f530109b6cdbb22d8138094443b48834d16cb
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-20 09:33:13 +00:00
Michael Winkelmann
95aa7f42de QmlPuppet: Refactor ChangeBindingsCommand
Change-Id: Id3020a73f59a1adfd25066a37d083d923e77956b
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-20 09:33:04 +00:00
Michael Winkelmann
098d32b370 QmlPuppet: Refactor ChangeLanguageCommand
Change-Id: I31813d13da753ba742488943afea673540b3a3fa
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-20 09:32:48 +00:00
Michael Winkelmann
888cbe7f8a QmlPuppet: Refactor ChangeAuxiliaryCommand
Change-Id: I32eb04db96322883aa908e22724756f5e25ded09
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-18 13:25:59 +00:00
Marco Bubke
22fcfb0d6f QmlDesigner: Fix compilation of coretests
This reverts commit 7856c2c2f0. There were files
compiled which are not used in the tests but have external dependencies.
So instead of using the preprocessor we simply don't link the source
files in the project.

Change-Id: Ibba4a1dace1868b016af7135262c795bb29af204
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-18 12:14:06 +00:00
Robert Loehning
0a3f193d1e Update German translation
Change-Id: Ib719b350b97b9df5d6178e61a39b77293c52613c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-18 09:13:53 +00:00
Marco Bubke
fcabab7b5f QmlDesigner: Extend captured data
Change-Id: I780815e6f42be4f3aceb1d784a685cc330572832
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-17 14:45:22 +00:00
Miikka Heikkinen
7adc062cf9 QmlDesigner: Allow plain expressions to be set with LineEdit control
Task-number: QDS-2603
Change-Id: I10a1b513bc21b8736683d4ddc2e290c29b39696d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-17 07:17:26 +00:00
Eike Ziller
5183994a30 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ibb60b8a7ac531b239bb9c490da843d5cc1a6300a
2020-08-14 13:31:05 +02:00
Eike Ziller
a71dbd4b33 Fix different UI aggregation styles for widget project wizard
This got lost during the transition to JSON.
Amends 241efa353d

Fixes: QTCREATORBUG-24422
Change-Id: I51dec2e84adb3c5944ecaf83697f3e776bd3d7f1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-08-14 07:37:24 +00:00
Marco Bubke
bfddaf6f9f QmlDesigner: Fix linux build
Change-Id: I32f560e18def0a72f2b94ab2fa9e8b6ea20f1bc4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-13 12:36:30 +00:00
Eike Ziller
0c4135e380 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	src/plugins/android/androiddeployqtstep.cpp

Change-Id: Id624bad384050d567efba0700046331086cb12dd
2020-08-13 13:28:33 +02:00
Eike Ziller
f296ed1328 Merge remote-tracking branch 'origin/4.13' into master
Change-Id: I1c426d95eedd82bd4470a64a9bafd734d23081ac
2020-08-13 11:41:32 +02:00
Tim Jenssen
4fe5b923cd Merge remote-tracking branch 'origin/qds-1.59' into 4.13
Change-Id: Ic720f3adab305c5ef8cd10e713ccabf510eff0c0
2020-08-13 06:39:40 +00:00
Marco Bubke
dc870f538d Prepare merge of qds-1.59 to 4.13
It is not compiling but we are closing this branch anyway.

Change-Id: If96318175d92ae492871d668d5c937c473fd05d5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-13 06:24:10 +00:00
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
Eike Ziller
3944162039 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
	src/plugins/cmakeprojectmanager/cmakebuildstep.h
	tests/auto/debugger/tst_namedemangler.cpp
	tests/auto/qml/codemodel/check/tst_check.cpp

Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2
2020-08-10 15:56:54 +02:00