Commit Graph

63619 Commits

Author SHA1 Message Date
Thomas Hartmann
6b6b844020 QmlDesigner: Add QmlFlowTargetNode::isFlowEditorTarget()
Change-Id: Ieacd59baa5b99bed4def6001de88c43545d0e309
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 11:03:37 +00:00
Thomas Hartmann
8262fdf5f9 QmlDesigner: Fix QmlFlowTargetNode::assignTargetItem
FlowDecision can have multiple targets. No reason to delete existing ones.

Change-Id: Ifdc42234c132ce5e0e212e1b3803a7ddcc25c27d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-21 11:01:34 +00:00
Thomas Hartmann
88a76df3d9 QmlDesigner: Finish FlowDecision support
Change-Id: Ic4e10fa442ea684890cfb79285760bc38991b494
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 11:00:11 +00:00
Thomas Hartmann
543efebc53 QmlDesigner: Fix updates in FormEditor
Some updates when auxiliaryDataChanged were missing.

Change-Id: I73146d10b80e8905f073332b727ef809bcf4a471
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 10:58:11 +00:00
Thomas Hartmann
75e6d4402c QmlDesigner: Expose all states to property editor
Change-Id: I9b89a9f8a8ed23c18ef5421a4380e90a484ae097
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 10:57:58 +00:00
Thomas Hartmann
b39edea495 QmlDesigner: Add QmlObjectNode::allStateNames()
Change-Id: Icc6a7404f4437411189465cb71e8bc3543b68d23
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 10:57:45 +00:00
Thomas Hartmann
3caafb2b81 QmlDesigner: Inspect components for existing states
For each created items we retrieve a list of the names
of all existing states.

Task-number: QDS-1978
Change-Id: I8e85e439fce3c6204cb8bcf69f6be847cc8dae5c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 10:57:26 +00:00
Thomas Hartmann
dbccc57597 QmlDesigner: Support different transition targets
FlowDecision and FlowWildcard can now be connected.

Change-Id: Iee7f38a23ba2c12d2843996eca46ff31f66af5a4
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 10:56:38 +00:00
Thomas Hartmann
8b8a99cda7 QmlDesigner: Add QmlFlowTargetNode
QmlFlowTargetNode allows to abstract different types
of transition targets.

Change-Id: I222992389a00237d3f51026f8b0fc8ab82da5028
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 10:56:14 +00:00
Leena Miettinen
6c8c501d6b Doc: Update screenshot of kit debugger options
To use the Design theme.

Change-Id: I2b25bc7d3baf51b3430b0aaff848a2be8e180540
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-21 10:49:42 +00:00
Henning Gruendl
07f8c1d0f3 QmlDesigner: Add padding for QtQuick positioner
Add PaddingSection for Column, Row, Flow and Grid positioner in
PropertyEditor.

Task-number: QDS-1501
Change-Id: Icd7b6ed2ab371e3a821e725668ca0c9c63d1c1c9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-21 10:38:10 +00:00
Robert Loehning
fd17810e82 Squish: Don't use negative y-position for QMouseEvent
Change-Id: Ib453b41e5906ddf24228b92f8c904b39eea4526f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-21 10:04:35 +00:00
Robert Loehning
7c95e17436 Make WidgetTips Squish-testable
Change-Id: I337fdca3541c5b2fb8f09ab2d7721b8950c0bea9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-21 10:01:01 +00:00
Thomas Hartmann
8c7a06efd5 QmlDesigner: Set the same style on both GraphicsViews
The timeline uses two GraphicsViews on the same scene.
To avoid glitches the styles have to match exactly.

Task-number: QDS-1977
Change-Id: Iac31e1773425feb2e2a63cdb5ff16ae266addc92
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 09:47:56 +00:00
Henning Gruendl
04265b2651 QmlDesigner: Fix workspace list update on clone
Adds a missing emit of workspaceListChanged when cloning a workspace in
the workspace manager. It will fix a missing update of the workspace
ComboBox in the toolbar.

Change-Id: Ic2eb3fe516841ba13456c7d94fe699518988ff7a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 09:45:08 +00:00
Thomas Hartmann
74ffff63eb QmlDesigner: Allow setting state property
This has to be blocked only for the root item.

Task-number: QDS-1979
Change-Id: Ia05255468623fe715e3f7172e2f058a70629b783
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 09:43:11 +00:00
Thomas Hartmann
0c94ab724a QmlDesigner: Map "base state" to empty string
The name of the "base sate" is "".

Change-Id: Ic1474a33e7cc98dd7f8980673599c4b7f0f8ecd0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 09:41:28 +00:00
Thomas Hartmann
970f075e33 QmlDesigner: Show proper error message for component
If a component cannot be created we have to show a proper
error message.

Task-number: QDS-1980
Change-Id: I48a6ff0fd89c9666328c501abb00dc0997171d96
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 09:41:12 +00:00
Thomas Hartmann
d8e986abca QmlDesigner: Add helper functions to BindingProperty
Change-Id: I5ec122a03e6d1476246e579ef0776bb8261e8364
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 09:40:58 +00:00
Thomas Hartmann
769db413b8 QmlDesigner: Fix BindingProperty::addModelNodeToArray
Change-Id: I140fecf4895005f8d860efae72242ef70cfe4bde
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 09:40:45 +00:00
Leena Miettinen
d0e72c10da Doc: Update screenshots
Change-Id: I749f009c785243e9434f5ecc8885f9f7c0210392
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-21 06:20:43 +00:00
Leena Miettinen
e4ba8327ab Doc: Describe setting default line endings
For all projects or for the current project.

Change-Id: Ie29c4ad42e62810a5c51e950b0d764e906308bda
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-21 06:20:23 +00:00
Thomas Hartmann
756a9ca4ca QmlDesigner: Add missing updates to FormEditor
Change-Id: I500c3ffd4f6801a8ae3a5eb5dab968ad3c2611ac
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 05:46:47 +00:00
Thomas Hartmann
b75fac036a QmlDesigner: Fix crash
Change-Id: Id87a0fc3bb6b9369c743aa985f707facd994f387
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 05:44:19 +00:00
Thomas Hartmann
ad94463134 QmlDesigner: Take care of deleted items in FormEditor
The FormEditor did not take care of deleted transition items
in all cases.

Change-Id: Ic5a700b98ae8c400ffd398c5c6972587e2863971
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 05:43:59 +00:00
Thomas Hartmann
e75a1ea601 QmlDesigner: Force node list property
We assume a list property if forceNonDefaultProperty is set.

Change-Id: Iabfe4753dc9af17e0504cb94170597c3b2f3c47b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 05:43:33 +00:00
Thomas Hartmann
72cd449f80 QmlDesigner: Support forceNonDefaultProperty in createQmlObjectNode()
Change-Id: I991af0304851c227c7e2911e3fd90a4de2788786
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 05:43:10 +00:00
Thomas Hartmann
f4f1c2b30a QmlDesigner: Allow defining default colors in FlowView
Change-Id: Ib4e2b6eb7283044ecbab5ced839a6d4d35b284c1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 05:40:54 +00:00
Thomas Hartmann
bfb86a68fd QmlDesigner: Adjust DragTool for FlowMode
If editing flows all items are added to the root node.

Change-Id: Id1ec5810947c08e8b46d753df49e0b05f919061b
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 05:37:01 +00:00
Christian Stenger
f9ff63e340 Squish: Avoid false positive in tst_CSUP01
If intrinsic headers are globally present the proposal
widget might also suggest _mm_undefined_si128 or
_mm256_undefined_si256 when typing 'unsi'.
Be slightly more specific and therefore exclude these.

Change-Id: Ie988ce7a1312fb31803a6e9fa885e10a51229d09
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-04-20 18:47:52 +00:00
Thomas Hartmann
cfb64f00d6 QmlDesigner: Add support for more AuxiliaryData in property editor
Change-Id: If5e5b7b52da991f6aa488715d99c36f4499696d8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-20 17:10:02 +00:00
Thomas Hartmann
d223da63e2 QmlDesigner: Reduce priority for editing anotations
Editing annotations is possible using the context menu.
We can keep it as the default on double click, but it should have
lower priority than other tools.

Change-Id: I6cd51074460c5f32030e9d799abda4a198036409
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-20 17:09:22 +00:00
Thomas Hartmann
eb82d396e3 QmlDesigner: Add ModelNodeToArray() to BindingProperty
Change-Id: I98761ee607882f24bff89c3745af2f6f35587c1d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-20 17:08:47 +00:00
Henning Gruendl
a35a9e72d9 QmlDesigner: Extend icon font support
* Use ADS::IconProvider to make use of font icons
* Add support for IconProvider in FloatingWidgetTitlebar
* Add support for named font icon entities in QmlDesigner::Theme
* Add level of indirection to Constants.qml to be able to parse it
  from inside C++
* Add color and HighDPI support in stylehelper
* Update RichTextEditor
* Update icon font and related constants

Task-number: QDS-1913
Change-Id: I7212f4dfe480dbb340fd042f59c69b8f5ca7a8e4
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-20 16:21:46 +00:00
Mahmoud Badri
2f99a87a3f QmlDesigner: Fix material texture not updating after image DnD
Image path from project root is used instead of image name to make it
work when the image is inside a folder.

Task-number: QDS-1956
Change-Id: Ia5e10d7bf893902eaea6551e3ec6daafd7977a83
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-20 15:16:16 +00:00
Thomas Hartmann
98ad7f96bb QmlDesigner: Add extra check
The node might be also invalid.

Change-Id: I3f9ecd63f178f15c495f6b60d36b02cb54b5d254
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-20 14:46:38 +00:00
Thomas Hartmann
022b2b47e9 QmlDesigner: Remove check
This is taken care of in update already.
Empty section are not shown.

Change-Id: I48763c42bb7d1b39e36b87be35e48c558a512c77
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-20 14:44:17 +00:00
Thomas Hartmann
f94c8e1143 QmlDesigner: Show FlowWildcard and FlowDecision in item library
We want to show those in the flow mode.

Change-Id: Ifc997102f37495d759355adcefb98b1febd11d53
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-20 14:43:59 +00:00
Eike Ziller
8ec6872226 Update changes file for 4.12.0
Change-Id: I22fefcfd6270d7e003c83a82edfc5d9084d169c8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-20 13:16:19 +00:00
Eike Ziller
a45d3e12a4 CMake build: Add public include for QmlDesigner plugins
QmlDesigner plugins need this include path, no need to repeat that over
and over again. It also makes it easier to support out-of-repository
plugins.

Task-number: QTCREATORBUG-23778
Change-Id: I33e959fe56815e59a5e8e0db0bbdff016411b067
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-04-20 12:05:58 +00:00
Leena Miettinen
faa8547b12 Doc: Fix links to QtAndroid functions
Add a dependency to the Qt Android Extras module to the
doc configuration file to enable linking to the module.

Change-Id: I69271554f78a0d73fc44032f9310e9670b06961e
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-04-20 11:56:50 +00:00
Leena Miettinen
b7e5362e8f Doc: Update info about run settings
Task-number: QTCREATORBUG-23364
Change-Id: I5753db6a82e62a371b9d5fb89c01d3ec87676ad3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-20 11:06:29 +00:00
Tobias Hunger
d0e0ffd2d2 Revert "CMake: Pass on extra files to code model"
This reverts commit 4d3eea6884.

Reason for revert: QTCREATORBUG-23876

Change-Id: I1b438d13cbdf64870e7cc9f7432665d773f58369
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-20 10:05:08 +00:00
Eike Ziller
8383ca777f Add some documentation on action manager and commands
Change-Id: I03d8292120b30973155248471b12d1627536fb39
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-20 08:12:34 +00:00
hjk
458ff1e967 Android: Persist ABI selection for multi-arch builds
Change-Id: I67fe60bc5a5bd0c086d36368fec4369e4744dab8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-04-20 07:43:52 +00:00
Eike Ziller
9e84724c53 Fix "Link with Qt" for Qt offline installers
The Qt offline installers do not necessarily write a QtCreator.ini.
Check for qtversion.xml as well.

Change-Id: Ib7fd9f39444a8eec817646dd495fdc94696906e8
Reviewed-by: hjk <hjk@qt.io>
2020-04-20 06:33:55 +00:00
Assam Boudjelthia
9e057a5536 Android: add support for new SDK Tools package cmdline-tools
The newly added cmdline-tools is not used by Qt Creator.
So QC Android settings will be broken for users who have
an Android SDK installed from Android Studio, or who
updated their SDK package (i.e. tools -> cmdline-tools).

This patch fixes both of the following issues:

1- QC looks for sdkmanager tools under <SDK_ROOT>/tools/bin/sdkmanager,
and with the new SDK it's under
<SDK_ROOT>/cmdline-tools/latest/sdkmanger.

2- QC checks the version of the SDK tools and opens the
old SDK Manager for SDK tools version 25.3.0 or less.
However, since cmdline-tools is now version 1.0, it causes
QC to think this is an old version.

Fixes: QTCREATORBUG-23726
Change-Id: I7e6bbc6840d24d358f68dfa3e229799394ace950
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-04-18 16:31:36 +00:00
BogDan Vatra
fdb0cf0f6b Update openSslPath when we change the android sdk path
Change-Id: I39bd02d4f5bba8d03d4606b0de89b50778c7aa01
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-04-17 13:04:38 +00:00
Thomas Hartmann
f671d46c1d QmlDesigner: Add extra check for invalid node
Change-Id: Id3cb9b6a2eb8230f0e3403fad30c57a67227fa5e
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-17 11:30:18 +00:00
Thomas Hartmann
f9fb5d7e88 QmlDesigner: Fix crash
Change-Id: Iaabc04e97fb7e06d462e7716be27a24471be2bd2
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-17 11:29:29 +00:00