Commit Graph

67787 Commits

Author SHA1 Message Date
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
Denis Shienkov
d3ab2bb990 BareMetal: Add comment about allowed word width in Keil C{51|251} compilers
Change-Id: Iccb8956ae9325d45fb8a6803c9673a7d61c048a6
Reviewed-by: hjk <hjk@qt.io>
2020-03-23 11:08:40 +00:00
Denis Shienkov
5852cf1e9f BareMetal: Unify pre-defined macros dumping for mcs{51|251} architectures
... for Keil C51 and C251 toolchains.

For this case we create and compile the special common input file which
causes generation of an expected console output with the following pattern:

 <some text> (""|"key"|"value"|"")

From which we parse the required 'key' and 'value' entries.

Change-Id: Id10cf20319b21363374da45bcb5ed8b6a90b307f
Reviewed-by: hjk <hjk@qt.io>
2020-03-23 11:08:23 +00:00
Eike Ziller
41fb7e5855 Add changes for 4.11.2
Change-Id: I737c6655af0b82007597fcc483fee3f2e2da1604
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-03-23 09:07:22 +00:00
Eike Ziller
ee2840d5b8 Merge remote-tracking branch 'origin/4.12'
Change-Id: Ic741fdedc168430e5be6cb1645d9329dbc7a6b08
2020-03-23 09:35:54 +01:00
Leena Miettinen
e3581a3961 Doc: Fix Document Manager docs
Task-number: QTCREATORBUG-23620
Change-Id: I7c70398008e9c8855beef9b2239e1a7431904076
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-23 08:29:22 +00:00
Miikka Heikkinen
0496318e9d QmlDesigner: Update selection box when target mesh changes
Change-Id: I45d54baa78e9f8547da65358d93c6d376f24ce3b
Fixes: QDS-1840
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-23 08:05:37 +00:00
hjk
80a766a2cb Qmake: Move buildDir() from ProFileNode to QmakeBuildSystem
More a buildsystem than a node thing in general and removes
one use of activeBuildSystem and one use of the ProFileNode
-> ProFile back pointers.

Change-Id: Ie007fcd0db9e9294a08b3a1cd68f825c7d3dc9b8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-23 07:42:15 +00:00
Eike Ziller
a040bebe5d Add "Install Plugin" button
Shows a wizard. Select a library file or zip file, and if you want to
install in user location or Qt Creator install.
For zip files it requires "unzip", "7z" or "cmake" in the PATH.

Change-Id: I191079046cbd2cb6ab181bc044a00488af41b349
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-23 07:39:06 +00:00
Eike Ziller
9eceb46739 Fix link on commit sha in about dialog
Passing a URL via defines breaks when trying to "stringify" it.
It would always stop at the first slash.
Instead use a qmake variable directly. That has the additional advantage that
the value isn't passed on each and every compiler command line.

Change-Id: I97a297fbcdee5ea03eb6fa08181c95b1ad2de767
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-03-23 07:14:27 +00:00
Filippo Cucchetto
549b2f6092 Nim: fix nimble build step default arguments
Change-Id: I2c3374f0d0fce2ec9b1811061008b0984558436e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-03-22 12:07:52 +00:00
Andre Hartmann
59f6c6282c VCS: Capture more hashes with suffixes
Recognize multiple trailing carets and
tilde/number combinations too.

Amends 098ee51a9b

Change-Id: I91ea33f7e2dae61f18c2899c949034ebedca0157
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-03-21 18:50:48 +00:00
Aleksei German
e4e5ffc492 QmlDesigner: Add default indicator for States
-Added better indication for default state
 -Cleaner removal and rename of default state

Task: QDS-1825
Change-Id: I6f90ffcf831883999210e5b5534b46fa2a6c1eda
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-20 18:27:18 +00:00
Mahmoud Badri
be7517460d QmlDesigner: Fix view 3D DnD wrong animation on mac
On mac when dragging a 3D object to the view 3D, the drag icon flies
back to the items library. This commit fixes this.

Task-number: QDS-1829
Change-Id: I4fb6eaacf90775282976e03498739fa25f8d63d6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-03-20 15:08:09 +00:00
Christian Kandeler
6a07e2c341 Output panes: Do not allocate extra standard formatters
The OutputWindow base class has a functioning default formatter these
days.

Change-Id: I0a75d0a081cdd2cfdd913388419483df836a53e9
Reviewed-by: hjk <hjk@qt.io>
2020-03-20 14:49:49 +00:00
Miikka Heikkinen
5e7cd5bf0c QmlDesigner: Register 3D edit view actions properly to ActionManager
Also fix one FormEditor action that specified its shortcut incorrectly.

Change-Id: Ieac988ff17c5ceee07a15ef0a31ab409829609a4
Fixes: QDS-1841
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-03-20 14:43:17 +00:00
Christian Kandeler
04a99c1de1 Remove the limitation that output formatters have to be exclusive
Introduce an aggregating output formatter that forwards its input to a
sub-formatter that feels responsible for it, or otherwise lets the base
class handle it.
Our output panes now use such an aggregating formatter.
In particular, this means that in the future, we won't have to stuff all
run control output formatting into the Qt output formatter anymore.

Change-Id: I5498f200a61db10ccff3ec8974c6825da7f7072d
Reviewed-by: hjk <hjk@qt.io>
2020-03-20 13:48:15 +00:00
hjk
7158e67612 AutoTest: Move TestCodeParser and TestTreeModel ownership to plugin pimpl
Change-Id: I01b32aae894a4b419c8a067f604d5f04a2b14dfe
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-20 13:13:52 +00:00
Tobias Hunger
a596421ffc BuildSystem: Clean up use of BuildSystem::(kit|target|project)
Change-Id: I4852689cb54d02bb278f9cd596f1de506a43fc04
Reviewed-by: hjk <hjk@qt.io>
2020-03-20 13:10:01 +00:00
Tobias Hunger
9e0a1b3621 BuildConfiguration: Add helper to create a build directory
Use the helper in CMake. Everything else does not seem to directly
create directories.

Change-Id: I50fba8c461471a1bcd0f9c187a857730c35e4f8f
Reviewed-by: hjk <hjk@qt.io>
2020-03-20 13:09:45 +00:00
Mitch Curtis
e96b00bfb4 Qt Quick templates: move visible assignment after width and height
This is more common; visible and enabled are usually after size-related
bindings.

Change-Id: I2148491d8a8fdbf4f7bc2b261bd6472bae697969
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-03-20 12:52:33 +00:00
Robert Loehning
7a1974cb34 Squish: Remove dead code and simplify
Task-number: QTCREATORBUG-16607
Change-Id: I2bd8857317adf046e4563a150a74186f4c2d233e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-20 12:18:57 +00:00
Eike Ziller
b8c5e58ef2 Run configuration: Fix layout of debugging options
The differences in QFormLayout lead to unexpected results on macOS.

Change-Id: If2b55a6233af3f8ac1afa6e3c586a16a263b32b5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-03-20 12:18:04 +00:00
Lars Knoll
99a81e78d5 Port from QRegExpValidator to QRegularExpressionValidator
QRegExpValidator is going away in Qt6, so port over to the
version using QRegularExpression.

Change-Id: Iecd1ba1f0e5e01009ae43b79c1ccc73f0fc046b2
Reviewed-by: hjk <hjk@qt.io>
2020-03-20 11:39:42 +00:00