Commit Graph

63610 Commits

Author SHA1 Message Date
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
Tobias Hunger
2e4915bdb9 BuildDirectoryAspect: Print non-existing directories in red
Change-Id: Ic747fe45d4e4d83c9b8d641ab2df13d8b4a770ae
Reviewed-by: hjk <hjk@qt.io>
2020-03-20 09:45:26 +00:00
Tobias Hunger
cda392d02d BaseStringAspect: Enable use of validators
Change-Id: I93ec60da6dc783beb2a81c0cc25c942e82e75f42
Reviewed-by: hjk <hjk@qt.io>
2020-03-20 09:44:13 +00:00
Miikka Heikkinen
7c09d34feb QmlDesigner: Fix icon gizmo position update after edit camera change
Changing edit camera could take a couple of frames to propagate the
the correct position to icon gizmos. It's unclear why exactly this
happens, but a trivial fix is to just render a couple of extra frames
whenever the camera changes.

Change-Id: I8c4fc33bff9cb7a4c4ac3b5105327cc5eb0a45d5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-03-20 08:24:09 +00:00
Miikka Heikkinen
ea16d20804 QmlDesigner: Fix id corruption on paste
When pasting model nodes, any bound expression referring to a node in
the same pasted set gets fixed so that the expression refers to a
pasted copy of the node instead.
This fix makes it so that only fully matching ids are replaced instead
of also partial id matches. The old matching broke e.g. when the paste
included both "cube" and "cubeMaterial" and a binding to
"cubeMaterial". Without enforcing the full id matching, the binding
became "cube1Material1".

Change-Id: I3c622ea946c74d59a192157ca06d096467428364
Fixes: QDS-1564
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-03-20 08:23:52 +00:00
Miikka Heikkinen
ddca92fc93 QmlDesigner: Add onboarding text to 3D edit view when there is no 3D
Change-Id: If9513da39efcc19129de6867ea7357bc6c0e2af4
Fixes: QDS-1748
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-20 08:23:30 +00:00
Denis Shienkov
f1c2a6ae5b BareMetal: Introduce isArmArchitecture() function
... to simplify the architecture comparison code in Keil toolchain.

Change-Id: I1d8ee46022f73e6ec2192339848b6d1c500bf791
Reviewed-by: hjk <hjk@qt.io>
2020-03-20 07:47:27 +00:00
Denis Shienkov
83d2271ec6 BareMetal: Add support for Keil C251 toolchain
This patch adds support for the C251 toolchain, provided by KEIL:

 * http://www.keil.com/c251/

Now the auto-detected C251 compiler will be displayed with an
appropriate ABI on the "Options->Kits->Compilers" page.

Change-Id: I40cf2b82117420b2eddb09cad902c9f264bac062
Reviewed-by: hjk <hjk@qt.io>
2020-03-20 07:40:34 +00:00
Eike Ziller
af29767857 Bump master->4.13.0-beta1
Change-Id: Ia25db16341e45f75c893c21c159775fd3428b538
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-20 07:21:45 +00:00
Eike Ziller
d80f3972a4 Merge remote-tracking branch 'origin/4.12'
Change-Id: Ia8254720b2ba6e3e7b859017e1c2b6e289bed771
2020-03-20 08:16:19 +01:00
Eike Ziller
7f0b418a22 Merge remote-tracking branch 'origin/4.11' into 4.12
Change-Id: I125d2e574cbee28d69c8181909f2db57e897f0a4
2020-03-20 08:00:06 +01:00
Andre Hartmann
098ee51a9b VCS: Capture hashes with trailing caret
The Push-to-Gerrit dialog calls

  git branch -r --contains 3fa72ff^

for example.

Change-Id: I6c0bd792dd5bf85dec61fa576fbd8bba3aa9f06d
Reviewed-by: Miklós Márton <martonmiklosqdev@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-03-20 06:08:30 +00:00
David Schulz
b17de35ef4 Debugger: Add separator between cdb extension paths
According to
https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/
general-environment-variables
extension paths have to be separated by a semicolon.
Skipping the separator results in not being able to
debug with cdb since the debugger cannot find the
Qt Creator cdbextension in the now invalid extension path.

Change-Id: Ic1c478dbb94f4e774e6742a3800dbcf6452898d5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-20 05:25:46 +00:00
Tobias Hunger
5de0e81d8b CMake: Fix typo in symbol names
I can't spell occurred:-/

Similar typos in 3rd party code (sqlite) has been left in place.

Change-Id: I7cfa9911fc434d42ce3df8e9c7ccb83dc00401e8
Reviewed-by: hjk <hjk@qt.io>
2020-03-19 17:50:21 +00:00
Eike Ziller
c6e03959d8 Bump version
Change-Id: I1139e1c10311fda9f46367dcb397fa674050f7da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-19 16:26:44 +00:00
Knud Dollereder
4f9d1a0454 Clean pinned curves from the curveeditor when changing projects
Fix a warning

Task-number: QDS-1036
Change-Id: I9844ba6fac1e2ef8652f111e1ec7a51134015597
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-19 15:45:14 +00:00
Christian Kandeler
4657563e4a ProjectExplorer: Try harder not to lose custom project settings
... when a kit disappears.
This can easily happen, for instance due to a Qt version update via the
installer, and until now resulted in the disappearance of all user
customizations of build and run configurations.
We now store some additional data when serializing a target, and use it
to recreate a kit of the same type upon restoring. While the resulting
configurations are not guaranteed to be functional, they should contain
all the customizations, which the user can then copy over to a proper
kit.

Fixes: QTCREATORBUG-23023
Change-Id: I659d52808b2f8a308e6aa094e8ef2ee60d586952
Reviewed-by: hjk <hjk@qt.io>
2020-03-19 14:28:40 +00:00
hjk
f2f6452977 Debugger: Fix some breakpoint file name display breakage
For unclaimed breakpoints the wodking directory was shown
as path.

Amends commit a7dd0e50a2.

Change-Id: I9614b3672d32fb18e35dc98c12a60e3b27eebf84
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-19 13:39:48 +00:00
Christian Stenger
62ac17e608 McuSupport: Fix build with gcc 5.3
Change-Id: Id9000f4c4874a7dadee79fafdeec0e4485e175ef
Reviewed-by: hjk <hjk@qt.io>
2020-03-19 13:39:07 +00:00
Christian Stenger
a51a4f7915 Squish: Fix expected object properties
Change-Id: I7f2e3ef4559fac83d17a06a231036be45f9e63bb
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-03-19 13:11:15 +00:00
Eike Ziller
3b5fc296f2 Python editor: Add buttons & actions for opening REPL
Opens interactive Python, optionally with the current file imported, for
testing and experimentation.

Change-Id: Ieb120e3698bdba77a1445c40fe7fda533773a0cf
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-19 13:04:48 +00:00
Knud Dollereder
6cc080e055 Make sure to neither load nor store invalid qeasing-curves
Remove set-value-spinbox.
Do not convert single-segment-qeasing-curves to bezier if they would become invalid.
Do not store invalid qeasing-curves in the keyframe ModelNode.
Make sure that a conversion does not produce nans

Change-Id: I0688de55bf6b0ef6fe69d70d9192d852c8d6b895
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-19 12:30:22 +00:00
Assam Boudjelthia
db23f3e10b Android: Handle ANDROID.APK role in QmakeProFileNode
Change-Id: Ifac2377248f72c07f087fd4b294dc21e93a0ed7c
Reviewed-by: hjk <hjk@qt.io>
2020-03-19 12:00:19 +00:00
Christian Kandeler
be9d5fa0d9 Disable project-editing actions when parsing is scheduled
For the purpose of enabling context menu actions such as adding or
removing files, there is no difference between "parsing" and "parse
scheduled".

Task-number: QTCREATORBUG-22508
Change-Id: I484a9257b4e4aeb6e0ff089c58be513e9fd7a9fd
Reviewed-by: hjk <hjk@qt.io>
2020-03-19 11:44:54 +00:00
Tobias Hunger
9594612e5e Update .gitignore for VSCode users
Change-Id: Ide7264e5917dbbfc229d455ecbdbd490e8da7fa9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-19 11:18:01 +00:00
hjk
bc79ec1ee2 Qmake: Use a QmakeProFileNode instead of a generic node
... in handleSubDirContextMenu overload, obsoleting one cast there.

Change-Id: Ic6e8bfeee0fa2f8838a29df8123efe10f2faefd4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-19 10:13:18 +00:00
Christian Stenger
abca39aeae Android: Silence soft assert
Android toolchains need a fully loaded Qt version
manager.

Change-Id: Icf3ae7d79923b438047b87cbb400d0b8a341914e
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-03-19 10:09:04 +00:00
Mahmoud Badri
bb75966fc3 QmlDesigner: Fix keyframes not set in record mode in view 3D
Task-number: QDS-1448
Change-Id: I8041fd3fe52ab6f9cdcbc1fdc4935d06299866bd
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-19 09:56:45 +00:00