Commit Graph

61529 Commits

Author SHA1 Message Date
Eike Ziller
a8e3ae38cb Fix handling of ampersands in sessions menu
They must be escaped

Fixes: QTCREATORBUG-22814
Change-Id: I65f3c0774902fe21d0acc272bb434ab9321b3e67
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-06 13:17:18 +00:00
Tobias Hunger
70b8fa352a CMake: Remove legacy code from before version 3.7
Change-Id: I8f8c0136548230e755a939d8c1bdfa78f5a644bc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-06 12:48:27 +00:00
Thomas Hartmann
c09344ee62 QmlDesigner: Use intersection for selection
This is the default for UI tools like Figma or Sketch.

Task-number: QDS-853
Change-Id: Id4f5e0647b87169ec0fc0aaf02c6655ce0f78e45
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-06 09:15:46 +00:00
Thomas Hartmann
81b0051c91 QmlDesigner: Improve rubber band selection
The rubber band selection was only working from the outside
of the root item. This was quite annoying.

Now rubber band selection is always possible unless the drag
 is started on a selected item.

Task-number: QDS-853
Change-Id: I82ae2f3c644e7eede03fb6781b7ea1dda6ceb25c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-06 09:15:34 +00:00
Tobias Hunger
94ef30125e Nim: Do not crash on nullptr for buildconfiguration
That can happen, so handle it.

Change-Id: Idca02dac3deddd9771bc8ba0d7d27af313cde1ca
Reviewed-by: hjk <hjk@qt.io>
2019-08-06 09:14:16 +00:00
Tobias Hunger
926338f509 ProjectExplorer: Emit activeBuildConfigurationChanged on project restore
Change-Id: Id5f2d8b36d99df1ffc6e4e0d8a680b55e57c336e
Reviewed-by: hjk <hjk@qt.io>
2019-08-06 09:14:09 +00:00
hjk
0dc97a51b5 ProjectExplorer: Add a mechanism to access fixed data in ProjectNodes
To be used in CMakeTargetNode for Android-specific items, but possibly
useful for other combinations, too, at the price of (only) one empty hash
per _Project_Node.

Change-Id: I4ced56a6ddfa54a00f96be0507a556fa7b20b552
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-06 09:01:34 +00:00
hjk
eefabf2b11 Qnx: Remove RemoteLinuxRunConfiguration base from QnxRunConfiguration
Also un-export RemoteLinuxRunConfiguration and make it clear that
this is not meant for inheritnace.

For a while the last code-reuse-by-inheritance RunConfiguration,
until it served as precedence again. Raise the bar a bit, even
if this means duplicating some aspect setup lines.

Change-Id: I588e07e3f7ddbe3cae089a37059781a9f71048e1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-06 08:31:47 +00:00
hjk
5b33660a57 Debugger: Allow spaces in arguments with LLDB
Change-Id: Iebc6f7975e9a306805911ed18eb4689074abd891
Task-number: QTCREATORBUG-22811
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-08-06 08:07:25 +00:00
Tobias Hunger
ac091622e4 CMake: Move code from CMakeProject into CMakeBuildConfiguration
Move code closer to the BuildDirManager that was moved into the
CMakeBuildConfiguration.

Change-Id: I21d7188e4a3b03a02b12b01c7dd3e46754d653f8
Reviewed-by: hjk <hjk@qt.io>
2019-08-05 15:49:06 +00:00
Tobias Hunger
338a7184a5 CMake: Move builddirmanager into CMakeBuildConfiguration
Change-Id: I1854b6021e7d573abd4ac9d64c8d5dbd0618ed71
Reviewed-by: hjk <hjk@qt.io>
2019-08-05 15:48:57 +00:00
Tobias Hunger
8c34d653be CMake: Fix WS
Change-Id: I2558ae2f69c67a039aea96200878b056ed391ed7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-08-05 15:44:08 +00:00
hjk
678793675b ProjectExplorer: Remove stray semicolons
Change-Id: I2fc02ee07daa28609f39e4e78f3860bb768ea6e9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-08-05 15:35:51 +00:00
Tobias Hunger
2f80d45b5f ProjectConfiguration: Clean up initialization of m_target
Change-Id: I28290c5fe1d9505f78157a2a62af1e24589d13b2
Reviewed-by: hjk <hjk@qt.io>
2019-08-05 15:32:20 +00:00
Tobias Hunger
de6faa0f15 CMake: Better warnings for strange/invalid CMake binaries
Warn when cmake is configured to use a non-canonical path. This might
trigger problems in CMake itself.

Show this warning in the Kit as well as in the CMake options page.

Also complain other issues in the CMake options page.

Task-number: QTCREATORBUG-22583
Change-Id: I841341db8305f9152543487ce9ceeab2eca0b2b9
Reviewed-by: hjk <hjk@qt.io>
2019-08-05 15:13:40 +00:00
Tobias Hunger
0b493a351e CMake: Fix WS
Change-Id: I5bd56e994c5aacc0c4086c4eae1242b2d977a2ec
Reviewed-by: hjk <hjk@qt.io>
2019-08-05 15:11:24 +00:00
Christian Kandeler
b0694ed465 ProjectExplorer: Use Utils::DisplayName for Kits
Change-Id: I1ca25fef2c488ca5ea07d102fb7321a6cf89f007
Reviewed-by: hjk <hjk@qt.io>
2019-08-05 12:37:19 +00:00
Eike Ziller
92bcdab604 Add missing override
introduced in 839f45faa9

Change-Id: Ib03147cb7cb44df812c090f228fa809b22f9b159
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-08-05 11:46:07 +00:00
Eike Ziller
ea901fd4f1 Fix setting the default kit
Broke in the recent kit manager refactorings.
Notifying the kit manager about the update for "Apply" leads to an
update of the config widget via KitManagerConfigWidget::kitWasUpdated +
::discard, which resets m_isDefaultKit.

Change-Id: I382101099c61eb439e12c86cc45c8ca1fa91ddc7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-05 11:39:51 +00:00
Eike Ziller
cc47a525f1 Remove some unused QDesktopWidget includes
Change-Id: Ie369124e2202a79261d08ce9c756499acd552ac9
Reviewed-by: hjk <hjk@qt.io>
2019-08-05 10:37:58 +00:00
Denis Shienkov
b7f34ef7f9 Debugger: Make peripheral register group menu scrollable
... to save a display space.

Change-Id: I93812bb97538dc88cc6e871a40e1bce6419024c1
Reviewed-by: hjk <hjk@qt.io>
2019-08-05 09:26:25 +00:00
Eike Ziller
9d02477ae6 Fix crash in TODO plugin
There was a mixup of keyword index and start introduced in
94041d7b44

Change-Id: I1be979762d6ccab8a60382f919288278ddf136c6
Reviewed-by: hjk <hjk@qt.io>
2019-08-05 08:17:03 +00:00
Eike Ziller
652a84e14a Bump version -> 4.10.0
Change-Id: I2f5dfc47978514a6377db63705a703ce16f20499
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-05 07:00:49 +00:00
Eike Ziller
4608e84d9c Merge remote-tracking branch 'origin/4.10'
Change-Id: I633cb7dce95e107d0e0c62dc49a7ebacad0fbbe5
2019-08-05 08:45:11 +02:00
Nikolai Kosjar
fdc058f304 .gitignore: Ignore also CMakeLists.txt.user*
Change-Id: Idf700cc207b458275a045f6e3d3076e9966b12c6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-05 06:43:30 +00:00
Christian Kandeler
f244ee7433 QbsProjectManager: Ensure run config display name after restoring
Amends 1d7f6fe298.

Change-Id: Ie2b37eb5c83d662e51fa9fc68f878c3d42765985
Reviewed-by: hjk <hjk@qt.io>
2019-08-02 14:34:05 +00:00
hjk
16b9a47e83 ProjectExplorer: Replace Project::projectConfigurationChanged
... by a Project::buildConfigurationChanged. That's the only case
used, and saves filtering on the receiver side. Also, the passed
bc is (in non-null) the active one, so isActive checks are not
necessary.

The null case seems to be only possible to trigger when removing
the currently active build configuration manually i.e. happens rarely,
so having it trigger an unneeded final display update on the dying
build config is tolerable, so drop the null check in such cases
to achieve a more uniform pattern.

Change-Id: I46f72e9e277767214dbd6920dd86b026a7084f46
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-02 13:59:31 +00:00
Christian Kandeler
9bcb54e9f7 Update qbs submodule
To HEAD of 1.14 branch.

Change-Id: I0302319e4775edcfdde0f09440d80aea34e87b6c
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2019-08-02 13:59:08 +00:00
hjk
cd1338cc30 Debugger: Work around a Qt deprecation warning
Change-Id: Ia396ec2a4b50b39692d659d107ef5bb7e5e5e5bd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-08-02 12:31:08 +00:00
Christian Stenger
32ce4d5071 Lldb: Fix event handling for newer Xcode and faster machines
If the system or the running inferior produces output while
fetching data the output did interfere with the state handling
of the debugger engine which in turn lead to a complete
inconsistent state of the debugger where the states of the
debugger bridge and the debugger engine (QC internal) assumed
complete different states.
Circumvent by explicitly ignoring the state for inferior output
on stdout or stderr.

Change-Id: I81aa0bacd41de4266a9278c66fed908dd72c9d44
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-02 12:29:35 +00:00
Christian Kandeler
45f9c178e1 ProjectExplorer::IDevice: Add a default display name
Task-number: QTCREATORBUG-16281
Change-Id: Ieff929343b5dc3a84d9ecf5f4f0a032cb4ae4076
Reviewed-by: hjk <hjk@qt.io>
2019-08-02 12:23:12 +00:00
hjk
86d0c7ef66 ProjectExplorer: Move ProjectExplorerPlugin::directoryFor etc
... to Node::

It's completely self-contained, and uses less indirections this way.

Change-Id: I2f9274ee46b53b6443f52bc45f620b43d43f529c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-02 11:40:58 +00:00
hjk
aad1df06f0 ProjectExplorer: Remove unused PEPlugin::updateContextMenuAction
Change-Id: I95e3ec3441661632395f100089c46d7809ea630a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-02 11:37:57 +00:00
hjk
ca67d3016c ProjectExplorer: Use direct calls to signal update wishes
Change-Id: I73d4a417f23bcf7fd8c9e16640e920100a6cce5a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-02 11:32:44 +00:00
hjk
1dfa84c362 Qbs: Work around recent regression in build config connections
... by using direct calls instead of relying on project subscribtions.

Amends  4c80380478.

This is arguably even progress by itself as the direct call is
cheaper than the signalling.

Change-Id: I63400e76826db4517a5a5865e17620c131c69dce
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-02 11:28:27 +00:00
hjk
dcb892cf39 Update build step widgets only on changes to the owning build config
Updating on changes to other build config seem excessive, as the
updated details only depend the owning build config.

Change-Id: Iba86f2b56033ac55381d452dd2a435e5dda72674
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-02 11:20:45 +00:00
Christian Kandeler
b85b805092 Introduce Utils::DisplayName
The concept of a default display name as used in ProjectConfiguration is
useful, and we'd like to use it elsewhere.

Change-Id: I10d9a5bd3d3e385a99f1122c6b119136662502fa
Reviewed-by: hjk <hjk@qt.io>
2019-08-02 10:27:00 +00:00
Christian Kandeler
1d7f6fe298 ProjectExplorer: Don't store ProjectConfiguration's default display name
The default display name, if there is one, is always set by the
constructor and/or the factory, and thus does not need to get stored. In
fact, storing it can lead to unwanted effects such as the value not
updating after a language change.

Task-number: QTCREATORBUG-16281
Change-Id: I200cf84a7304e41994ba3ebe69cd759b051cbac7
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2019-08-02 08:50:35 +00:00
hjk
eaea7eb213 ProjectExplorer: Do not filter invalid abis in GccToolChain::fromMap
Should not be needed in "real" GccToolChains unless the toolchains
files are manually changed and requires ugly workrounds e.g. in
derived ebAssemblyToolChain::fromMap.

Change-Id: I4ca99de5122156d3b0b2595ba768a242cbf02732
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-08-02 08:20:52 +00:00
Nikolai Kosjar
6d7a626910 Deploy clangd binary also on macOS
Amends c1a0d89732.

Change-Id: I81c23522d2332c9db442ceadf94559407fd3594f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-02 07:29:50 +00:00
Andre Hartmann
839f45faa9 FancyLineEdit: Add camel case navigation
Use it for search and replace functions as well as for Locator.

The camel case navigation can be switched on / off with
the existing menu Options > Text Editor > Behavior >
Enable Build-in camel case navigation.

Fixes: QTCREATORBUG-21140
Change-Id: I3f2dcafff231366b3c8f08c14514dd8940cca2a0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-02 06:40:56 +00:00
hjk
71e9e3832a WebAssembly: Remove ToolChain::fromMap hack
GccToolChain::fromMap does not filter anymore.

Change-Id: I0e76703ef1074b4d50999a72b1f598856627de74
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-08-01 16:53:01 +00:00
hjk
09e5c167bd ProjectExplorer: Add convenience Project::addTargetFor{Default,}Kit
Less noise on the user side.

Change-Id: I5cdf4af4910a3cc1ee0af1b43fcbc7329a6d59db
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-01 16:16:29 +00:00
hjk
72fe2c706e ProjectExplorer: Inline Project::restoreTarget()
... into its only internal user.

Change-Id: I3f2d1a3af757036cc2194967a71ad0d48ed05d9a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-01 16:16:02 +00:00
hjk
b0a00869db Nim/Qbs: Append clean steps by id to build configuration
Change-Id: Icd775c771939c72aea1f9fd73bbbd9f8481703eb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-01 16:15:41 +00:00
hjk
4c80380478 ProjectExplorer: Remove Target::*ProjectConfiguration(...) signals
The only listener left is the target's project, which is known at each
emitting location and can be called directly.

Change-Id: If07d2c1c43fcf5d2094c0b6d59f773d12b4f6d6b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-01 15:23:25 +00:00
hjk
79f9449f68 CompilationDataBasePM: Do not delay creating targets
A target can/should handle/use unparsed projects just fine.

Change-Id: I54b8399eab4b4fe7ead2de3cef8ab25cc7bbc621
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-01 15:22:59 +00:00
hjk
2e14df7561 Some clang-tidy -use-modernize-nullptr
Change-Id: I1bed5e85a5b7948d08502a72a10f80baa075c204
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-01 13:20:26 +00:00
hjk
630385751a QmlDesigner: Remove last use of Java-style iterators
Change-Id: Iec4e99c19edcdd7476751018169b776eb6c8fefc
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-01 13:20:08 +00:00
hjk
b7366f3cce QmlDesigner: Compile fix: More Java-style iterator removal
We use QT_NO_JAVA_STYLE_ITERATORS, and Qt dev has wrapped more
iterators with that, so without this patch (or undefining
QT_NO_JAVA_STYLE_ITERATORS) creator does not compile.

Change-Id: I7d3ef0ed11db72e07333e21311725cd13136696a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-08-01 12:08:53 +00:00