Commit Graph

67787 Commits

Author SHA1 Message Date
Thomas Hartmann
f61c75c454 QmlDesigner: Make selection indiactor ignore zoom
We have to use ItemIgnoresTransformations and calculate
the correct position.
SelectionIndicator::updateItems() is called when the zoom is changed.

Change-Id: Id3e9d643b20c15c831a4e2d8ac72eea15a6b0d1f
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-06 17:17:59 +00:00
Thomas Hartmann
9364205b3d QmlDesigner: Add viewportTransform() to LayerItem
Change-Id: Ia90ae0a079922b3c1cdd429ee0f6e337c59267a5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-06 17:17:45 +00:00
Thomas Hartmann
7ff4ebff1e QmlDesigner: Revert Shorten lifetime of AnimationCurveDialog
This reverts commit c0637b8283.
Reason for revert: Does not fix the issue and is unnecessary complicated

Change-Id: I3a1d48a736241ca031462c7694bf21afe93dcccb
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-06 17:17:33 +00:00
Christian Kandeler
a6e6a53e82 QbsProjectManager: Build up the project tree in a dedicated thread
... and only switch the root node in the UI thread.
Creating the project tree can take some time for larger projects; no
need to block the UI for that.

Task-number: QTCREATORBUG-18533
Change-Id: I093dc9fb8f3454011a3c64bcc0f785e8b7753b4e
Reviewed-by: hjk <hjk@qt.io>
2020-02-06 17:00:56 +00:00
hjk
ede1d31a3f CppTools: Make CppCodeStyleSettingsPage a plugin pimpl member
Change-Id: I75f90ddbb3cb1f2dbded16c8b6eb6d6c9bbc9f50
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-06 17:00:22 +00:00
hjk
278e981422 Qmake: Deactivate parse guard before it can cause trouble
... in the QmakeBuildSystem destructor

Change-Id: I23336cc0b72673fd2c63235b1c568439159d3d8d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-06 16:45:04 +00:00
hjk
7e326657e9 CppTools: Use a plugin pimpl data member for CppToolsSettings
Change-Id: I05c2f8f34b88973fc916115f71c0557675396366
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-06 16:27:52 +00:00
Leena Miettinen
0e6d0616fc Doc: Fix Utils::NetworkAccessManager class docs
- Fix class name in the \class command
- Add missing docs

Task-number: QTCREATORBUG-23544
Change-Id: I6ec6b6637cd6d766bb5870f01d5f374f32c7fe12
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-06 16:04:46 +00:00
Christian Kandeler
cd9571b4f7 CppTools: Optionally move raw project parts creation into thread
... by letting callers pass in a generator function.
This takes some load off the UI thread for larger projects.
For now only used by the QbsProjectManager, which can provide a thread-
safe generator function due to the project data existing in "value"
form.

Task-number: QTCREATORBUG-18533
Change-Id: I525dea36a4c4079bd1bd5a4fff844617547d56f1
Reviewed-by: hjk <hjk@qt.io>
2020-02-06 15:53:46 +00:00
hjk
fd8187cb86 Mercurial: Simplify DiffEditorController setup
Change-Id: I28157e5ac310d8921bf16676cd695060d29c0254
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-06 15:37:04 +00:00
hjk
9c02a11039 Vcs: Separate plugin and QObject parent roles for VcsSubmitEditorFactory
These are different when the factories are used as real members,
as already done in Bazaar.

Change-Id: I3c187896dcbacb5156be1543424ccacb9140a493
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-06 15:02:04 +00:00
Tobias Hunger
e4738904d9 TargetSetupPage: Improve reporting on invalid kits
Give the reason for a kit being disabled in the tooltip.

E.g. for a CMake project you will now get

"Kit is invalid: No CMake tool set."

instead of a generic error message about the kit being invalid.

Change-Id: Ic776dc24149d65ebf27163b605ec2e52a3a504a7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-06 13:50:57 +00:00
Leena Miettinen
d34e93e58d Doc: Fix MimeType docs
- Remove internal and duplicate docs
- Add missing docs
- Edit language and formatting
- Remove unnecessary \fn commands, so the signatures don't need
  to be maintained

Task-number: QTCREATORBUG-23544
Change-Id: I85193979e4679b4e2fd2c219132eab4c977ac886
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-06 13:46:28 +00:00
Miikka Heikkinen
ec4e60e691 QmlDesigner: Fix build with Qt 5.14.1
A quick3d private API used was introduced in 5.14.2

Change-Id: I03e48fb79068e16a24b2c2a1e128d59efb6c8fad
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-02-06 12:51:58 +00:00
hjk
e3e6cece89 CppTools: Use a normal plugin pimpl member for CppModelManager
Change-Id: Id2c4b098084808070ef91de13c8338184e52141d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-06 12:24:21 +00:00
Christian Kandeler
67f66a39be VcsBase: Fix memory leak
Change-Id: Icb0c2a86ee0d5a1e22dc17fbc2a5d155b928e459
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-06 12:14:03 +00:00
Topi Reinio
4454873b54 Extending Qt Creator Manual: Fix links in the online sidebar
Change-Id: I08ca0c0847c022052428623de3be0416b8682e8d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-02-06 11:54:02 +00:00
Eike Ziller
ca42bf7696 Bump version to 4.11.2 and copyright year to 2020
Change-Id: I8e97c8f3e38dd1a6fe64e47cd30d73d3d5622425
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-06 11:41:42 +00:00
hjk
b22768e980 Diff/Vcs: Use a function object for reloading
Helps with slimming down the user code side.

Change-Id: I4b0aac76c0d1516eb05bff9c18594e64f8b41a7a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-06 11:21:59 +00:00
Orgad Shaneh
0737291d54 Merge remote-tracking branch 'origin/4.11'
Change-Id: I65ce6aa917219a8f8b91b48c7077f8097248375c
2020-02-06 12:50:22 +02:00
Thomas Hartmann
85497ea4f2 QmlDesigner: Remove unsued QGraphicsProxyWidget
Task-number: QDS-1525
Change-Id: I2270ad280cad36af3a8a66b5205a8049f93a7828
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-06 10:33:31 +00:00
Tobias Hunger
1722a3c837 TargetSetupPage: Keep selected kits selected on filter change
If a selected kit stays visible after a kit filter change, then keep
this kit selected.

Kits that do not get matched by the filter are unselected automatically.

I find this way more intuitive to use: E.g. when you filter a selection,
check something while filtered and then reset the filter the selection
now stays.

Change-Id: Ib557d5149a2009725a946183445911f13db76af5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-06 10:21:56 +00:00
Christian Kandeler
faa56b1965 QbsProjectManager: Fix setting up extra compilers
There were a couple of typos breaking the functionality.
Also separate updating extra compilers and the code model.

Change-Id: Ie8f7bbf62d4b7817af3a26298401ad99c011b6e5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-06 09:53:17 +00:00
hjk
fd5461b93d CppTools: Use a normal plugin pimpl member for StringTable
Change-Id: I2804b623b7ec03f6f4375452c9a422604468aafa
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-06 09:51:40 +00:00
hjk
90f2f4b1dc ScxmlEditor: Pimpl plugin
No direct advantage locally, but gets rid of one QObject parent
use of IEditorFactory.

Change-Id: I15611e96d0e6a38ee2c301cb6ba7387ad207265d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-06 09:51:28 +00:00
hjk
ca89d1b8a6 DiffEditor: Pimpl plugin
The standard pattern, and allows to drop the QObject parent on
the editor factory which gets into the way of de-QObject-ifing
the IEditorFactory hierarchy.

Change-Id: I5c6a50f8075a99592ed4459b417ca8ba7471ae96
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-06 09:47:00 +00:00
Tobias Hunger
3f17fa4a12 TargetSetupPage: Improve handling of checked kits
This patch makes the TargetSetupPage only check one kit by default,
independent of whether or not a preferredKitPredicate is set or not.

The logic is the following:
  * Use the default kit first if it is preferred
  * Use any preferred kit
  * Use the default kit
  * Use any enabled kit

* Do not check kits when the kit filter changes for now, that is
  for a later patch.

* Do not change kit selection as Kits get added/removed/modified if
  that is not necessary

Change-Id: I1e2bf594b902cf3e64d62588cde1dfb8e797bd3f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-06 09:32:34 +00:00
Leena Miettinen
055bfb9339 Doc: Fix PluginManager docs
- Mark internal functions \internal.
- Remove docs for signals that QDoc seems to consider internal.
- Remove obsolete information.
- Edit for language and style.

Task-number: QTCREATORBUG-23544
Change-Id: I8c7b48e6c338acd3d529b81203b4beb64ab4fe24
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-06 09:23:22 +00:00
Miikka Heikkinen
07ada921dc QmlDesigner: Fix camera frustum visualization in 3d edit view
Now camera frustum visualization should always appear correctly in
3D edit view, as the QSSGRenderCamera node is created at frustum
geometry update time if it's missing. Active scene change
also triggers geometry update for camera gizmos.

Change-Id: If24e97490b2ff6607049b5288c6e167aa29a86b2
Fixes: QDS-1472
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-06 08:41:11 +00:00
hjk
0b1a463c47 Core: Remove one IEditorFactory::addMimeType overload
Not overly useful in the times of QT_RESTRICTED_CAST_FROM_ASCII

Change-Id: I87032b1da9cc4e8205d2a9c8596bc9ba832acf30
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-06 08:33:53 +00:00
hjk
582b0216c6 CppTools: Remove yet another flag initialization with nullptr
Change-Id: I35b1033f8b69b5564fcf86a6406c486be0e90bbf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-06 07:52:13 +00:00
hjk
d54df35deb QmlDesigner: Standardize settings page
Plus a bit code cosmetics.

Change-Id: I56207def707ee3da1de9f46e50fa0ca900011b7c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-06 07:44:09 +00:00
Christian Stenger
f2946cdd19 Core: Fix missing include
Change-Id: I08266f0aaa1d7b33f8273ed585b8c97df2e85038
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-06 07:30:06 +00:00
hjk
3b575caf70 Core: Move ShortcutSettings dialog to new setup
Change-Id: I28dcbeb79f3cb712fcd5f7c768ef73c4ea483732
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-06 07:28:44 +00:00
hjk
7f37c503db Vcs: Move responsibility to set editor parameters to editor factory
So it doesn't need to be named twice in the editor factory setup.

This intentially includes a de-optimiztion: storing the parameters
by value, not by pointer. That's more natural, does not need to
keep the parameters alive on the caller side, and it's uncritical
in this context.

Change-Id: I92867d3f2f75c38911ae82d3eeb4759cba71b723
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-06 07:03:44 +00:00
hjk
c17767c78e Vcs: Use setters to set up DiffController parameters
Plan is to avoid client use down there, so extract the actually
used data first and pass it down.

Change-Id: I088fc9cc3086e8f6e1e0c3c9d3a35445f752e6f0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-06 07:03:14 +00:00
Miklos Marton
8f88b89d81 Make http(s) urls clickable in the VCS output pane
Fixes: QTCREATORBUG-23536
Fixes: QTCREATORBUG-19171
Change-Id: Ibf6d632031068c7f52cb15f534960e8238bdb21d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-05 22:02:39 +00:00
Orgad Shaneh
adcea96868 Git: Rename Show Diff -> Diff
Change-Id: I5b04edb6661cde53003a8cfe72854b4c214e187e
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-02-05 21:15:23 +00:00
hjk
f8e4d61fc3 TextEditor: Handle TextEditorActionHandler ownership
... in TextEditorFactory explicitly. Plan is to remove the QObject
inheritance of the factory, so it can't serve as a parent anymore.

Change-Id: I7bad358b5d150c695befc7ad4afcf7c2be7fd248
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-02-05 14:21:44 +00:00
hjk
80e7e70889 TextEditor: Remove unused TextEditorFactory::setEditorActionHandlers
... overload.

Change-Id: I0bab88e1b3c40b7c34cda578209e9d150c2d56b4
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-02-05 14:21:35 +00:00
hjk
515baaa5e7 TextEditor: Remove unused TextEditorActionHandlerPrivate::q
Change-Id: I2f8c86c21e2879e36a24d645ec3670e3bcec7319
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-02-05 14:21:25 +00:00
hjk
4ad4871fdc GenericProject: Use own target instead of activeTarget()
... when updating deployment data.

Change-Id: Ifa18d4f4fce2fddba91989e2c3094299d4d1f0ac
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-05 13:30:10 +00:00
Richard Weickelt
3fb4fbf086 Update qbs submodule to HEAD of 1.15 branch
Change-Id: I13514ad02848db6fa5a453230eb7c938134ce3ae
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-05 13:07:26 +00:00
Leena Miettinen
bab8c9b91f Doc: Fix IPlugin class docs
Fix \fn command values and document missing enum and arguments.

Remove unnecessary \fn commands, so that the signatures don't
need to be maintained.

Fix formatting and language issues.

Task-number: QTCREATORBUG-23544
Change-Id: Iddddb704a51e7a4fa9ac79fa2d4a89aa6abeefd5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-05 12:48:15 +00:00
hjk
ea6da69e8b CppTools: Move CppFilesSettingsPage closer to new setup
Including some drive-by cosmetics.

Change-Id: Id9cdba68545907b099a70944c83fe17ad3c0b2a0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-05 12:42:42 +00:00
Leena Miettinen
674d342aa9 Doc: Add doc footer and sidebar TOC
These are required for publishing the manual at doc.qt.io.

Because this doc is more a collection of articles than a
traditional guide, list the topics in this guide in the
TOC in alphabetic order.

Change-Id: I2f604ee19f81dcaaccf4601440f178b41b77ec9a
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2020-02-05 12:11:19 +00:00
Leena Miettinen
a804f6b193 Doc: Fix Aggregate class docs
Add missing docs for Aggregate::changed().

Fix some formatting and style issues.

Remove \fn commands where they are not needed, so that the signatures
don't need to be maintained.

Task-number: QTCREATORBUG-23544
Change-Id: Ie5aac577d936aaa739588c99c36011e74a3313fe
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-05 12:10:58 +00:00
hjk
d7ae3b79f8 Core: Make IEditorFactory::createEditor use a function object
Also, replace or remove unneeded Q_OBJECTs, and make base
setters and adders protected.

Change-Id: I212257ef53984d8852dc8c478537199fc9483486
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-05 11:41:29 +00:00
hjk
ccc2a347a7 Vcs: Drop QActionSetTextSlotHelper
With the possibility to connect to any function that's not needed
anymore.

Change-Id: I307f706aa922a3b7d9f1cd7e2e88cece71090946
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-05 11:09:39 +00:00
The Qt Project
183048b587 Merge "Merge remote-tracking branch 'origin/4.11'" 2020-02-05 11:00:37 +00:00