Commit Graph

67787 Commits

Author SHA1 Message Date
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
Knud Dollereder
d72e18da2d Use QEasing instead of Bezier to paint the curve segments
This way "failure state" is reflected in the appearance of the curve item

Change-Id: I997f86f1a6072eaf65c77f2df0afd53a80dc0d0e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-19 09:45:48 +00:00
Christian Kandeler
ef6af1b7df OutputFormatter: Do the newline handling centrally
All output formatters are line-based, and they all did their own line
splitting and, if they didn't entirely ignore it, handling of partial
lines.
Instead, we now do all the book-keeping in the base class, and the
subclasses always work with complete lines.

Change-Id: I0b0df7951d0e4f6601f4d912230071784c87b3d3
Reviewed-by: hjk <hjk@qt.io>
2020-03-19 09:31:02 +00:00
Alessandro Portale
7675296fcf McuSupport: Make hardcoded target list "semi data-driven"
This change pushes the hard-coded list a bit towards a "data-driven"
approach. That way, the planned switch to the .json files based apporach
(see UL-2012) becomes less of a change.

Some target entries are added to match the current target list in Qt
for MCUs packages.

If we don't manage to get the .json-based target listing in place, this
could even serve as fall-back.

Task-number: UL-2012
Change-Id: If39e5d581ac19468b6f52ed221ec2d39bfab9f80
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-03-19 08:42:04 +00:00
Eike Ziller
c8a2ea5433 Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.cpp

Change-Id: I2a0ccb84560174c5170d5baaff526c0e095f0ba0
2020-03-19 09:35:50 +01:00
Miikka Heikkinen
ff6dd4dc2e QmlDesigner: Fix selection issues in navigator and 3d edit view
Fixed multiple issues with showing correct selection in navigator and
3d edit view:
- Dragging items from item library selects only that item,
  regardless if drag was done to 3d edit view or navigator
- Selection is shown correctly after reparenting items, including
  multiselection reparenting
- Adding a new item to the active scene now shows selection box
  correctly for that item

Change-Id: I5156ca4c22e606c41e1e346ea5c32c3d70d89f5e
Fixes: QDS-1577
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-19 08:12:55 +00:00
Miikka Heikkinen
bcfaa8cd37 QmlDesigner: Fix missing selection box when scene changes
Explicitly change the selection back to previous selection after
a scene change in puppet. Also reduced the existing timeout for
executing the pending selection command after calling
ensureSelectionBoxes, as we now explicitly render the next frame after
selection change and don't have to wait for rendering to trigger
otherwise.

Change-Id: Ibe8004890910ae15e7ac3172165bc72463c1e5cc
Fixes: QDS-1792
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-19 08:12:37 +00:00
Friedemann Kleint
4d48795934 TaskList: Do not save files in default session
Otherwise, when relaunching Qt Creator after working
with task lists, the same list is reloaded.

Amends 4eb633fd77.

Change-Id: If3bee39a30b9876e42f2b35f65eebc39ef3951bf
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-03-19 07:41:15 +00:00
hjk
ff33e4a57a Android: Fix a wrong use of QProcess::startDetached()
Change-Id: I447295611c8254afa85d7d60e29bf8a417d08960
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-19 07:26:51 +00:00
Tim Jenssen
cd3db4c093 amend "fix QPainterPath against Qt 5.15.0"
Change-Id: Ic950cf2670087c9c9707fa3be0c0ae198620df4f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-18 19:04:31 +00:00
Robert Loehning
93091bb6b6 Add comments for unclear "open terminal" strings
Change-Id: I74404897c4f477c29983febaadfd0397142881e6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-03-18 18:27:10 +00:00
Tim Jenssen
a72acde713 fix QPainterPath against Qt 5.15.0
Change-Id: I08aaf6886b04407f1e52ca4f56607c81fccec85c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-18 17:59:56 +00:00
Knud Dollereder
3e86ed81d9 Improve visual feedback of selections
- The handles can now take 4 kinds of colors:
   1) Unselected.
   2) Handles influenced by a selected keyframe take the selection-color.
   3) Handles that are about to be moved (the mouse hovers over it) take
      the hover color.
   4) Handles that are about to be indirectly moved (Handles that are influenced by the hover handles)
      take the activate color

- Apply some colors of the Theme to the curve-editor.

- Fixed a drag handle bug. (The bounding box for the handle was wrong)

Change-Id: Ib474c714aae8bf88a5fb916cbef62deb29bc483e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-18 15:33:19 +00:00
Christian Kandeler
070aca8fea OutputFormatter: Make more functions private
Change-Id: Ifde7ce2e685f8ad87e636a9825a5a4c649a6e23f
Reviewed-by: hjk <hjk@qt.io>
2020-03-18 14:58:32 +00:00
hjk
c3420c7fc3 Android: Remove AndroidConfig::updateDependenciesConfig()
Not used. Amends f46099d21e.

Change-Id: Ib943549f4a2171d8a1fe11c8f8aa303e6ddb8f16
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-18 14:52:43 +00:00
Assam Boudjelthia
819663c12f Android: AVD Manager don't highlight header elements
The highlighted headers gets a bit annoying and serves nothing.

Change-Id: I5061792ee080cb10740d2dedc26f06f499043ac1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-18 14:06:16 +00:00
Assam Boudjelthia
86090059dd Android: remove unnecessary minimumSize limit to permissions listView
The minimumSize can cause the manifest editor UI to have a vertical
scroll bar even if it's not needed on some small displays.

Change-Id: I78b855d63d5a5f16a77ce58b86f0537f526aec44
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-18 14:05:51 +00:00
Christian Kandeler
f4473a6da8 OutputFormatter: De-virtualize the clear() function
... and make it also clear the text edit.

Change-Id: Ifd073167b8afc27f3adafca1bdaf95316be7fdaa
Reviewed-by: hjk <hjk@qt.io>
2020-03-18 13:54:31 +00:00
Christian Kandeler
438195ae83 OutputFormatter: Remove unneeded function and include statement
Change-Id: I7372a340660e0e927c3e8e83dd438d5fa32304eb
Reviewed-by: hjk <hjk@qt.io>
2020-03-18 13:54:05 +00:00
Christian Kandeler
054e7c2164 OutputFormatter: Remove extra carriage return handling
There are no \r\n sequences in the text anymore at this point.

Change-Id: I3fc220e60ba481f8f8928f74500d18c450ec2e72
Reviewed-by: hjk <hjk@qt.io>
2020-03-18 13:52:59 +00:00
Christian Kandeler
34cf96d645 OutputFormatter: Simplify newline handling
There does not seem to be a reason to remove trailing newlines and re-
insert them on the next call. Presumably, this is related to historical
auto-newline magic.

Change-Id: If4dc8acf022d3895b41b887af25d63cca36bf8a4
Reviewed-by: hjk <hjk@qt.io>
2020-03-18 13:52:41 +00:00
Christian Kandeler
9348ac5fec Utils: Remove the *SameLine OutputFormat enums
Presumably, they were intended for output that shouldn't get an
automatic newline, but if there ever was such a thing as automatic
newlines, it must have evaporated over time. All users of
OutputFormatter provide a newline if they want one.

Change-Id: Ibd219b7305fd503ce075d6f77930d2b538d5e2e8
Reviewed-by: hjk <hjk@qt.io>
2020-03-18 13:52:17 +00:00
Christian Kandeler
80293aac93 OutputFormatter: Simplify logic
Change-Id: I092cdb351f7530284e915cd4955973b21f2577b5
Reviewed-by: hjk <hjk@qt.io>
2020-03-18 13:51:49 +00:00
Leena Miettinen
eecd2a5aa1 Doc: Fix QDoc warnings in Core plugin classes
Task-number: QTCREATORBUG-23620
Change-Id: Idf1fb2b3f930812c3cf18b9f8ced03fb8e0947be
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-18 13:39:43 +00:00