Commit Graph

69993 Commits

Author SHA1 Message Date
Eike Ziller
cfba41c307 Merge remote-tracking branch 'origin/4.15' into 5.0
Change-Id: I2e63e1136af4001836044f4e67e3d01c1e9f0369
2021-07-09 16:01:31 +02:00
Eike Ziller
94d227cd43 Fix build with MSVC
Amends c3e413a864

Change-Id: Idb7e3c9d4cf53cf989d5aa4dd4353db798b92fb6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
v4.15.2
2021-07-09 14:00:02 +00:00
hjk
3f06ca7cbb Docker: Drop the default /opt and /data mounts
They were helpful for my local setup but arbitrary and in some
cases detrimental in the general case.

Task-number: QTCREATORBUG-25981
Change-Id: I65636a9ba8340357f7c83990703fe6e74b2afed4
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-07-09 13:47:31 +00:00
Eike Ziller
e895a0380b Fix lupdate issues
Some tr functions missing, some places where we need full qualification
because lupdate gets confused with namespaces.

Change-Id: Ic1d6ef3b31960dda02bc0788a255857117acdca9
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-07-09 13:05:03 +00:00
hjk
c916bcd049 ProjectExplorer: Use FilePath::readContents() for API detection
Change-Id: I3f19ed8ffc99f43fde4b7e5edbb53f92c7ef17ab
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-09 12:48:43 +00:00
hjk
97578a4fee Utils: Allow an offset in FilePath::readContents()
Also, change the size limit to take a qint64. Contrary to e.g.
Q(6)Hash::size() there is a realistic chance that 31 bits are not
enough.

Change-Id: Idbe6e765a5cac4336b3d64a8e0adb14966fd18a3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-09 12:48:37 +00:00
David Schulz
dba0294b33 LanguageClient: fix parametersKey
Change-Id: I1ec383fa38db62cc3ed5e61f3fdd526d5edb565b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-07-09 12:18:59 +00:00
David Schulz
a5861b3995 LanguageClient: prevent removing duplicated completion items
The label is not sufficient to identify duplicates for language client
completion items, since the changed text is not always equal to the
label.

Change-Id: I4d3295944a78b541144ecac0982e1f09a53bec8a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-07-09 12:18:49 +00:00
Eike Ziller
03b048dc83 Merge remote-tracking branch 'origin/4.15' into 5.0
Change-Id: I5e57cb456e3f501d5182c8db3688c2729e9fadb2
2021-07-09 14:09:12 +02:00
Eike Ziller
c3e413a864 proparser: Update ProItems to state in Qt 6.2
Except for our Qt 5 workarounds with toStringView, qHash return value,
and ProStringList which must be an explicit QVector for Qt 5.

Most importantly that pulls in a change to
   ProString::toQString(QString &tmp) const
from 76004502baa118016c8e0f32895af7a822f1ba37 in qtbase, which replaces
a setRawData call which otherwise leads to severe issues when built with
Qt 6.

Fixes: QTCREATORBUG-25574
Change-Id: I488b4e0b63becc59a4ea34aace5c249921fa1a60
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-07-09 12:05:20 +00:00
Leena Miettinen
c7ee8b5504 Doc: Update info about image properties
- Fix changed field labels
- Update screenshots

Task-number: QDS-4561
Change-Id: I12c4db163e5dfcdd9aa9140b569e2fc2660355c8
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2021-07-09 11:51:55 +00:00
Eike Ziller
0568be071d Add changes file for 4.15.2
Change-Id: I691d64c4faac7158009d6f93a089cab184934893
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-07-09 11:34:39 +00:00
Christian Kandeler
792699be06 ClangdClient: Do not send document update requests
... when requesting extra data from clangd.

Change-Id: I3552a2b7e09a1947de6570352936fd45e95f37a2
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-07-09 11:24:57 +00:00
Christian Kandeler
4d3ed0fa93 LanguageClient: Do not send document updates when canceling a request
Change-Id: Ied675bb0eca353fd5ffe26540d99bafb6a874c0d
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-07-09 11:24:13 +00:00
Henning Gruendl
397f4054c7 QmlDesigner: Fix copy/paste style buttons
Task-number: QDS-4697
Change-Id: I689fcfb2d01f4c13f34044ed06ba2babeca0066a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-07-09 10:57:01 +00:00
hjk
9a03ce80bb ProjectExplorer: Implement FilePath related functions for DesktopDevice
Effectively redirecting to the !needsDevice() branches in the respective
FileUtils implementation.

Change-Id: Ib24f1ff6fe5301323fd1296cc2ffceb0db9e4672
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-09 08:27:05 +00:00
Christian Kandeler
f55d5d8ec1 LanguageClient: Do not re-highlight when receiving the error variant
... of a SemanticTokens message.

Change-Id: I0f6e55d6656c11e7925e3bc4400ea2e575b9f138
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-07-09 07:30:21 +00:00
Christian Kandeler
1f4826a0c4 ClangCodeModel: Clear existing libclang diagnostics
... when clangd takes over a document.
This fixes the problem that temporary diagnostics persisted after opening
a session.

Change-Id: Ic781f83747cabb4d15c2c1f8181e36f4343e0394
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-07-09 07:29:55 +00:00
Leena Miettinen
fee0a5a74a Doc: Describe copying and pasting property values in Design mode
Fixes: QDS-4693
Change-Id: I2c1cb5cf1d00738c38a926d70e5b1089ce82880b
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2021-07-09 07:05:23 +00:00
Christian Stenger
355a91f3e1 AutoTest: Fix displaying description for XML output
CDATA is send in chunks and we lose possible newlines as
we handle the output line by line.
Add it explicitly while processing.

Change-Id: I36bad7f23e2b9b3a5ce9ec92d2d1cb6211dd43a6
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-07-09 06:12:04 +00:00
Christian Stenger
7c56923704 AutoTest: Fix location information of data tags
Broke while moving over to use Utils::FilePath and correcting
the varying usages of name.

Change-Id: I6099f5f0dbc022d831fef78652932d69bd2e4326
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-07-09 06:11:57 +00:00
hjk
2451ba9213 Wasm: Test windows and linux parsing simultaneously
Change-Id: I25e562258125157b07d1fc1a950b5207abbf5d69
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-07-09 05:55:08 +00:00
Henning Gruendl
d6f717d0f8 QmlDesigner: Fix blocked/disabled state colors
* Fix color controlsBackgroundDisabled color in light themes
* Fix color value in RealSpinBoxIndicator state disabled
* Remove opacity change in AnchorButtons on enabling/disabling

Task-number: QDS-4692
Change-Id: I9adb28f54b8016bfffdd28f022fc746c629afe9f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-08 17:58:31 +00:00
Eike Ziller
4767dfcce3 qmake: Fix issues with executing system calls
Do not try to reuse the QFutureInterface that is used for the parsing
process. Reusing the QFutureInterface can lead to issues. So far no
problems were triggered, but a30aa4421a
introduced a watcher that tells the qmake parser to ignore all system
calls after the future was canceled. This was somehow, sometimes
triggered on the reused QFutureInterface even though the user didn't
cancel anyhing, leading to all system calls to bail out in the
subsequent run.

Using a new QFutureInterface instance for each parsing run solves the
issue.

Amends a30aa4421a

Fixes: QTCREATORBUG-25970
Change-Id: I6836c97038c36968e93815c6121bc284edbe19bb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-07-08 12:38:03 +00:00
The Qt Project
455a9dd385 Merge "Merge remote-tracking branch 'origin/4.15' into 5.0" into 5.0 2021-07-08 12:36:57 +00:00
David Schulz
ed199da1df LanguageClient: update outline after document
Do not react on documents contents changes, but postpone the document
symbol request after these document changes were send to the server.

Change-Id: I43ec8f832c6a1fa6471146a5ec6e3e9223b02c91
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-07-08 11:14:53 +00:00
Henning Gruendl
e8e32894cc QmlDesigner: Update EditableListView
* Apply new design to EditableListView
* Add hovered property to IconIndicator

Change-Id: Ie208d4de8fab8f7ca62856d80d1ad1decc609f1a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-08 10:52:24 +00:00
Henning Gruendl
c08f8fa155 QmlDesigner: Fix AnimationSection layout
* Fix AnimationSeciton missing SecondColumnLayout
* Fix QML Connections deprecation warning by using function syntax

Change-Id: I2a34b94b3e07397eb42984dd851b1cc7c6adca9d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-08 10:51:55 +00:00
hjk
b998ad621b Wasm: Some steps towards making it work on docker
To start using the docker bits the emsdk location has to
be specified manually in the path selector as
docker://<id-of-image>/<path/to/emsdk>

Change-Id: I70c6e7a334762953c3931105b7f697c608523159
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-07-08 10:28:56 +00:00
hjk
05545adb93 Utils: Change semantics of FilePath::onDeviceSearchInPath()
... and rename it to searchOnDevice().

We need to handle additional search directories anyways, so its more uniform
to always pass a list all of them.

Change-Id: I46c7860b51d11c26db58045ff3ab922148af021f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-08 10:28:49 +00:00
Eike Ziller
9692af87a2 Merge remote-tracking branch 'origin/4.15' into 5.0
Change-Id: Id5c2ab312272eba0ef8c0eb7b26f58913dce0723
2021-07-08 11:44:48 +02:00
Alessandro Portale
9a9b4080ae QmlPuppet: Fix build with Qt 6.2
Fixes: QTCREATORBUG-25763
Change-Id: I05f4b44a3793c41fd1c6812f40f6603892cdac50
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
(cherry picked from commit dcbf26490d)
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-07-08 09:22:41 +00:00
Christian Kandeler
eff5cbeb86 CppEditor: Enable/disable outline dynamically
The "outline enabled" property is not static: E.g. the user might switch
on/off clangd support, and then we should hide/show our outline,
respectively.
This also eliminates the danger of null pointer accesses.
Amends c0a44be27b.

Fixes: QTCREATORBUG-25963
Change-Id: I508b9700ba1a99204ea8315546db089486b5d122
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-07-08 09:14:21 +00:00
Leena Miettinen
50f9180cd2 QML/JS Editor: Fix UI text
Task-number: QTCREATORBUG-25915
Change-Id: I96da82dee989cc1833e1219f33cbee072df19f83
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2021-07-08 08:00:33 +00:00
Tim Jenssen
22a87fdd95 qmlpuppet: adjust to api changes in Qt 6.2
Change-Id: I3c9139cacb7ff9eb7b8138e0a7f589280a24c13a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-07 17:40:26 +00:00
Tim Jenssen
4c878e5700 smallstring: Avoid size_t to (u)int warning
Change-Id: If206f0e3a90694b4e0d50e2d4569e0d6a34cf8ce
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-07 17:40:04 +00:00
Tim Jenssen
59ac4dbf0d fix msvc Qt6 dev builds
Change-Id: I4264a15c5033b9123c4e97caa86a909e654cef34
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-07-07 17:39:56 +00:00
Tim Jenssen
40d03d1896 Avoid size_t to (u)int warnings with auto, where it is possible
Change-Id: I1ec7454ebce59d99bc828bfd5086907eb0905632
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-07 17:39:46 +00:00
Eike Ziller
cd84331848 CMake build: Fix workaround for new *Private targets with CMake < 3.18
Amends a803d04c17

Change-Id: I2df067d988a79845f4a9f85485c13e5e2f8019dc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-07 14:07:06 +00:00
Leena Miettinen
42141fed26 Doc: Describe "MCU dependencies" option in Kit options
Task-number: QTCREATORBUG-25642
Change-Id: I9b4be0682381dc886487b4c70d8bc9e79d8620b5
Reviewed-by: Erik Verbruggen <erik.verbruggen@me.com>
2021-07-07 13:52:44 +00:00
hjk
d7062b5b92 Utils: Allow additional directories for FilePath::searchInPath
This mimics Environment::searchInPath().

Change-Id: I8c772ed31c31c74b09c7aa0e4912de8586dd2468
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-07 10:43:46 +00:00
Orgad Shaneh
d2aa0f4ed9 Git: Fix regression on cherry-pick
Amends commit 55f768e1b0.

Fixes: QTCREATORBUG-25975
Change-Id: Ie49b64f777bd7155cc226b70c0c473a5ac1ce282
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-07-07 10:16:54 +00:00
Robert Löhning
e065107fa5 QmlJSTools: Guard against null pointer access
Fixes: QTCREATORBUG-25943
Change-Id: If9e6528b0dc5642dbd150e7d20aeb9347f3d4465
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Erik Verbruggen <erik.verbruggen@me.com>
v5.0.0-beta1
2021-07-07 09:45:52 +00:00
Leena Miettinen
916fc90b44 Doc: Describe Show Source and Header Groups filter in Projects view
Task-number: QTCREATORBUG-25642
Change-Id: Ic3243d0be5c15e1ff853b52271ba31e3c3b148b4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-07-07 09:03:20 +00:00
Eike Ziller
0df677f7ac AutoTest: Guard simultaneous access to header cache
It is accessed from multiple threads at once. Guard with mutex to avoid
crashes.

Amends 64ce2a6f43

Change-Id: I5048e5fcdb27b2492656b302775378829b6da013
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-07 08:45:59 +00:00
Eike Ziller
434c33f4ee Update changes file for 5.0
Change-Id: Ibbe0661d3ce1c5ff6a624e7908a996a3ad9e187a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-07-07 07:36:31 +00:00
Leena Miettinen
93be13bfc1 Doc: Describe new GDB options
Task-number: QTCREATORBUG-25642
Change-Id: I32b5d9bffd0eab2dbc1f6afd1f05be149fe1a10e
Reviewed-by: hjk <hjk@qt.io>
2021-07-07 07:33:14 +00:00
hjk
eb70e20453 Utils: Add a FilePath::environment
A hook into the system environment of the FilePath's device.

Change-Id: I274032f9e716f3cd8b2e4af2eca010b9805a4568
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-07 07:22:30 +00:00
hjk
4eec360563 Utils: Remove one ProcessArgs::expandMacros overload
Only used once.

Also allow logging of expansion failures.

Change-Id: I357ed6ed28fe379d482358c46b495bc727f86902
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-06 11:36:09 +00:00
Orgad Shaneh
86df204bad Git: Fix regression in log output on Windows
Current path appeared instead of the committer date.

This is probably due to the changes in handling commands. The command has
%cD%Creset. %cD% is interpreted as current directory, unless escaped.

Change-Id: Id564c338dc1f4d882e4449430000b7dcebdd7288
Reviewed-by: hjk <hjk@qt.io>
2021-07-06 08:09:05 +00:00