Commit Graph

63610 Commits

Author SHA1 Message Date
Knud Dollereder
20e95f2f19 Add the ability to unify keyframe handles
Task-number: QDS-568
Change-Id: I5b102423e8e166d41edf199c42305cee102e8b54
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-25 16:11:28 +00:00
Christian Stenger
0b7c4520cd AutoTest: Fix regression in frameworks order
Latest refactorings resulted in possible different orders
for the tree model as well as for the frameworks inside the
project wide settings.
Fix this by sorting explicitly and iterating over the list.

Change-Id: I9b673770b03732820f0ea4f902f3586abd07d51a
Reviewed-by: hjk <hjk@qt.io>
2020-03-25 13:38:55 +00:00
Christian Stenger
540ea616ec AutoTest: Fix handling of GTEST_SKIP
Fixes: QTCREATORBUG-23736
Change-Id: I3d52f3caf6b28e07d7d8d072fb33c782d33575c6
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-25 13:38:43 +00:00
hjk
6c1894b893 Qmake: Work around crash
The condition that's checked now triggered when playing around
with changing the JS expression that creating the default build
directory name.

Change-Id: I221be8cefb6918c10c383c23ee7cde73d3683e40
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-25 13:29:42 +00:00
Thomas Hartmann
02093f5ab2 QmlDesigner: Draw FlowDecision and FlowWildcard as diamond
Change-Id: Iade9c17d58354ac67ef990bd231325fad3a35fe3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-25 12:28:09 +00:00
Alessandro Portale
23dc065327 McuSupport: Register Qt for MCUs .qch files
At plugin initialization and along with the creation of a Qt for MCUs
Kit (which currently happens when the user presses "Apply"), these .qch
files get registered:

  <Qul_DIR>/docs/quickultralite.qch
  <Qul_DIR>/docs/quickultralitecmake.qch

In order not to duplicate the code for retrieving package paths (e.g.
the one for "QtForMCUsSdk") from the settings, some refactoring was
done.
As a result McuSupportOptions::qulDirFromSettings() has been introduced.
It will be also used in further changes.

Task-number: UL-1685
Change-Id: I82e638e129120cdadcf2f4812f467fce34b32ec9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-25 12:05:02 +00:00
hjk
05a0b33146 AutoTest: Simplify TestFrameworkManager
With only four items the hash is not really needed.

Change-Id: Ifc858bc6517e4e0ff46b515a74568742897ddb11
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-25 11:24:06 +00:00
Topi Reinio
595085cb71 Doc: Fix more documentation warnings for Extending Qt Creator Manual
Change-Id: I3ba4e6d2f6cfa2c05c0ee7af6db70dcbb80ae725
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-03-25 11:23:19 +00:00
hjk
dd980e23f8 ProjectExplorer: Remove Target::applicationTargets()
That's BuildSystem::applicationTargets() nowadays.

Change-Id: I01cf0a491e4cb289af08f529fd15c85bfcdf5493
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-25 10:42:22 +00:00
Robert Loehning
08e5e84c9d Android: Remove pointless line break
Change-Id: I3f8d94cb637c279d7549c819a03233cc8d4aff87
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-03-25 09:44:51 +00:00
David Schulz
b06ad16160 TextEditor: Make accidentally activating a link more difficult again
Only follow links under cursor if control was already activated when
pressing the mouse button. This amends
11eea3aae0 which just checks if control is
pressed after releasing the mouse button.

Change-Id: I90d23dd3e5ff63aac7812fad889ad9fb7c052b56
Fixes: QTCREATORBUG-23745
Reviewed-by: Alexis Murzeau <amubtdx@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-25 09:13:59 +00:00
David Schulz
c44681a7d2 Editor: Fix crash after resetting clangbackendreceiver
We must report back to the codeassist under all circumstances

Change-Id: Ic9519c80fb7c6b7e54419cb6fef610e3d73d23bd
Fixes: QTCREATORBUG-23708
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-25 08:59:31 +00:00
hjk
699407b4ba Debugger: Create central widget earlier
This ensures the showCentralWidget() call in  restorePersistentSettings()
has something to operate on.

Change-Id: I52e676517cad4e7c3c0e7ca80b8756f937c805a0
Fixes: QTCREATORBUG-23755
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
v4.11.2
2020-03-25 08:51:36 +00:00
Leena Miettinen
a7b7c31c9c Doc: Update info on Python run settings
Change-Id: Ia1da720286205bae18c7a01538430740510b9780
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-25 08:22:57 +00:00
Eike Ziller
a6ece1976b Add detailedText to CheckableMessageBox
QMessageBox creates dialogs that are not resizable, so extend our own
message box implementation with that feature and use it for the Plugin
install wizard.

Change-Id: I0e8a2d525894f8c2897b1e4d8ab546a856030c57
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-25 06:11:56 +00:00
Thomas Hartmann
cb77d33cc5 QmlDesigner: Improve painting code for connection
* Prefer horizontal connections
* Fix horizontal corner cases

Change-Id: I6867d104a1c97ef8dd8292bebe3e2a782a4ff000
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-24 18:32:05 +00:00
Thomas Hartmann
208fbe18c1 QmlDesigner: Implement proper connection of FlowDecision and FlowWildcard
This adds the code to draw connections from and to FlowDecision
and FlowWildcard.

Change-Id: I8f465ac70b92b26ca32eaeb45590e18e7db13693
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-24 17:14:23 +00:00
Thomas Hartmann
fbc177282e QmlDesigner: Relax condition
The to item can be invalid in some cases.

Change-Id: I0bd7a3f6ee2dc3aa7981ad266945cdceaaff647a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-24 17:14:14 +00:00
Thomas Hartmann
df1a21f92f QmlDesigner: Implement joinConnection
This flag indicates that the connections are ignoring the FlowActions
and connect the FlowItems directly.

Change-Id: I84587700e406d03ed9e30c224d93f46d2367034f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-24 17:14:01 +00:00
Thomas Hartmann
df9081f38e QmlDesigner: Fix crash
Change-Id: I31c6f8ce2b506af6d16887719a39319e6946a161
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-24 17:13:46 +00:00
Thomas Hartmann
03aed15fe9 QmlDesigner: Paint indicator for start in flow
Change-Id: I1db165489e89bed1db22433b961caff080b87305
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-24 17:13:29 +00:00
Thomas Hartmann
0e2144135c QmlDesigner: Create decision and wildcard items in form editor
Change-Id: Ib33c6fc9bc22885281b7172fe52e5326b6744cf3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-24 17:11:48 +00:00
Thomas Hartmann
da6f5c8b7b QmlDesigner: Add FormEditorFlowDecisionItem and FormEditorFlowWildcardItem
Those items are used to represent wildcards and decisions in flows.

Change-Id: I14e55591c01aeb4105f4d0757a0ea2d00392358a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-24 17:11:23 +00:00
Thomas Hartmann
6181eb8ec0 QmlDesigner: Add missing const
Change-Id: I0330cb1342a791e60ce67ff41b0a63b73a329030
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-24 16:10:01 +00:00
Thomas Hartmann
b8891fafe3 QmlDesigner: Fix check
Change-Id: I9838aa4f29223253eee0a0b8a70532e7081c2b0e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-24 16:09:38 +00:00
Thomas Hartmann
0bbed564bc QmlDesigner.PropertyEditor: Add joinConnection support
This adds support for new auxillary property "joinConnection".

Change-Id: Ibe54bb27e2a2aef219552f60bbdc929ea244b11f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-24 16:01:49 +00:00
Thomas Hartmann
94f7a927c3 QmlDesigner: Implement isFlowDecision() and isFlowWildcard()
Change-Id: I6ce2e0fe00049d40ee75781bd4b4eeb038fba640
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-24 16:01:36 +00:00
Thomas Hartmann
a21e35f079 QmlDesigner: Add support for Flow items to QmlItemNode
Add support for

* FlowView.FlowWildcard
* FlowView.FlowDecision

Change-Id: Ib928c37202cb150a8c64c04b0118660ae3296865
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-24 16:01:17 +00:00
Thomas Hartmann
6f858d9356 QmlDesigner: Add rootModelNode() to QmlItemNode
Change-Id: I2e1987484ece809ae0629174243fe521ad68aaec
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-24 16:01:02 +00:00
Thomas Hartmann
56ce070ec9 QmlDesigner: Fix crash
Change-Id: I10733858d6fd9024419ce00356bd689d5bf99597
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-24 16:00:28 +00:00
David Schulz
cc02d8dd0d Core: Do not save temporary documents when building
Change-Id: I9be6bf90d6a44b62e783964bc88870dc97b7b6e3
Fixes: QTCREATORBUG-23509
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-24 12:55:54 +00:00
David Schulz
398930d3cf ProjectExplorer: Set temporary flag on scratch buffer document
Task-number: QTCREATORBUG-23509
Change-Id: Ieb3922030cb1dd4984b91ac24d0396bb19a4a711
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-24 12:55:44 +00:00
Eike Ziller
6989c9bbea Highlighter: Fix resolution of highlighting definition
We should try to find a definition based on the file path first, before
falling back to the MIME type, since MIME types are not extensible. So,
if we find a definition for a MIME type, there could be others, more
suited ones based on the file path.

Fixes: QTCREATORBUG-7906
Change-Id: I9b35efb26d287dd4c975a8944fca9a310c417394
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-24 12:53:50 +00:00
Eike Ziller
d0589d7f6e Highlighter: Fix typo
Change-Id: I491f7c58733a333a5cdcf2ebae67f9d4bff1eeef
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-24 12:49:43 +00:00
Eike Ziller
289c9e959c Highlighter: Remove unused methods
We want all the possible definitions nowadays.

Change-Id: I491d40b103a2daf187571910bb43c32e0bfbb1e4
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-24 12:35:49 +00:00
Leena Miettinen
da1e153f3d Doc: Update info about Bare Metal devices
Fixes: QTCREATORBUG-23723
Change-Id: Ic7289849bab5901cf9860067f1d127e69617a328
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2020-03-24 12:35:09 +00:00
Cristian Adam
0366a8aadb ClangFormat: Compile fix for MSVC
When vanilla LLVM/Clang is used the #warning statement
causes actually an error on MSVC.

Change-Id: Id3f36efc1b21d48e52a9c44036b99a5b4d9a0d5c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-24 09:50:45 +00:00
David Schulz
00c0306040 Editor: Add Qt Script mime type
Fixes: QTCREATORBUG-23715
Change-Id: I4c7da375a11fb35c66e19769746267b2b661ee55
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-24 08:26:13 +00:00
Leena Miettinen
9bf8610935 Doc: Update info on automatically registering CMake help
Change-Id: Icdc010102055def6b87902c0c924f647f1f408da
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-03-24 08:11:10 +00:00
Eike Ziller
0876926db4 Shortcut settings: Fix wrong warning for shortcuts working in editor
Only shortcut sequences that start with a key without modifier do not
work in the editors. If the sequence starts with a shortcut with a
modifier, the following onces can be anything.

Examples are the default split related shortcuts, for example Ctrl+E,2
for split top/bottom.

Change-Id: I05d30926a0fee8815f85558ce1b9a6e2f79dc545
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-24 07:37:30 +00:00
Eike Ziller
dde6aa0a51 WASM: Experimental -> DisabledByDefault
Task-number: QTCREATORBUG-23733
Change-Id: I9f565e94967421e90b62c07bfdbde038de4b4b18
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-24 05:59:33 +00:00
Thomas Hartmann
e7dc340798 QmlDesigner: Only read AuxiliaryData from text if not set
If the AuxiliaryData is already set then we should not override it.
When the document is not changed AuxiliaryData is not written to QML.
Therefore the AuxiliaryData might be outdated.

Change-Id: Ife01e119ceb31c5f5ba88f8dae590e95ee6d1508
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-23 14:55:35 +00:00
Thomas Hartmann
4a5377c635 QmlDesigner: Make zoom and background color persistent
Task-number: QDS-1030
Change-Id: Ie3d1a244a137822848d75b14527a54d451eb0279
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-23 14:55:13 +00:00
Leena Miettinen
9639e07e3e Doc: Fix docs for Core::VariableChooser
Fixes: QTCREATORBUG-23620
Change-Id: I6adf1f035968a0a00ec4acfbda90ac52130a7e24
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-23 13:31:10 +00:00
Tobias Hunger
b30aa7fda5 CMake: Use BuildDirectoryAspect for UI related to Build Directory
Do not re-create the UI yourself.

Change-Id: I8e7610ee6717105a3e05743d0451a3c6732197c5
Reviewed-by: hjk <hjk@qt.io>
2020-03-23 13:16:34 +00:00
Tobias Hunger
10e79cebc9 BuildSystem: Add buildConfiguration() method
Add a buildConfiguration method that returns the saved
BuildConfiguration or the active BuildConfiguration if none is
set.

Change-Id: I8af25aa1037f59a0091900bac7eb84fed9e5fbb0
Reviewed-by: hjk <hjk@qt.io>
2020-03-23 13:16:15 +00:00
Tobias Hunger
95947f280f PluginDialog: Fix warnings
Change-Id: Icf4b80cccf0eac8f0f2ec5efddb41342e5cfa188
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-23 12:22:02 +00:00
Thomas Hartmann
55250545da QmlDesigner: Early reject identical AuxiliaryData
No reason to do this check all over the application code.

Change-Id: I99f00a115f919bc4c83beb98463d95b2f322644d
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-23 12:13:10 +00:00
Thomas Hartmann
4da76ae005 QmlDesigner: Remove qDebug
We allow such items in the item library now.
Examples are materials, 3dObjects and animations.

Change-Id: I5e5b614c9797e489db8f62e8f287e1dbfe91fc99
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-23 12:12:50 +00:00
Thomas Hartmann
cebd7c0346 QmlDesigner: Silent asserts
These conditions can happen.

Change-Id: I52e0740ecd0c134d559a0100448622126cabbf0e
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-23 11:13:28 +00:00