Commit Graph

70777 Commits

Author SHA1 Message Date
Christian Kandeler
04d49fb771 LanguageClient: Disable DocumentLocatorFilter for non-applicable files
Fixes: QTCREATORBUG-26338
Change-Id: Ief7a45dda74b931b26731647adba43861cb09777
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-30 09:37:33 +00:00
Christian Stenger
f4a7c74daa PE: Welcome: Fix displaying project paths
Do not use native separators by default as the separators
depend on the context.

Change-Id: I28e73395ae2d7bb71774c060dd9540dc48c4c992
Reviewed-by: hjk <hjk@qt.io>
2021-09-30 09:18:15 +00:00
Assam Boudjelthia
b7c15d4d8d Android: Make fixes to androidqmlpreview
This amends 261a39cbbd with fixes
to issues noticed after merging the initial patch.

Change-Id: I5f859374cbba3a2e020e6ca0789cc2b387d2739a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-30 09:06:23 +00:00
Thomas Hartmann
969d659713 QmlDesigner: Allow resolvedUrl in ui.qml files
Change-Id: I220582466ffe62392b78419b9a2f6b83cf73f9af
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2021-09-30 08:41:57 +00:00
The Qt Project
b1d5abd8eb Merge "Merge remote-tracking branch 'origin/master' into 6.0" into 6.0 2021-09-30 08:32:51 +00:00
hjk
adc9cffab3 ProjectExplorer: Drop some unnecessary QFileInfo and QDir use
... in kitinformation.cpp. And clean up a bit.

Change-Id: I94c781290349e1abcc9b3a51d1a7b4164f8d3c37
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-30 08:32:33 +00:00
Christian Kandeler
be3dd751cb ClangCodeModel: Replace FIXME comments with links to bug reports
Change-Id: Ib6520781e88b8dcf63dd553e199939ff65ae1f05
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-30 08:19:07 +00:00
Eike Ziller
83c0396382 Merge remote-tracking branch 'origin/master' into 6.0
Change-Id: I966d964cd194d6422da92fa77a734247a02f9cd9
2021-09-30 09:38:54 +02:00
Alessandro Portale
c30bfde80c Icons: Let Inkscape 1.1.1 change the document as much as it likes
New Inkscape versions (in this case 1.1.1) want to store paths, styles
and transforms differently than their predecessors. Letting this happen
for the whole ducument in one go makes one ugly commit, but keeps the
following diffs cleaner.

Change-Id: I0aeb76d0679573838db41c6935f02d6b27e0575d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-09-30 07:30:59 +00:00
Orgad Shaneh
b8b3970329 Git: Fix warning when applying settings with Ok
The current parentDialog is the settings window, but it is closed
immediately, so the warning just disappears.

Change-Id: I7f5033239bf18e758595965587947bec40facf6f
Reviewed-by: hjk <hjk@qt.io>
2021-09-30 07:26:04 +00:00
Orgad Shaneh
13067a7d9c CommandLine: Find executable in PATH when it is relative
Task-number: QTCREATORBUG-26329
Change-Id: Ie7b30ea5c73d11e4a9961bdaa732ee36e0e377e7
Reviewed-by: hjk <hjk@qt.io>
2021-09-30 07:04:33 +00:00
Eike Ziller
19abb9f877 Merge remote-tracking branch 'origin/6.0'
Change-Id: I9d25a7ac39b3619856fc8d8a6be6f91a403b3969
2021-09-30 09:03:12 +02:00
The Qt Project
f2a157897f Merge "Merge remote-tracking branch 'origin/5.0' into 6.0" into 6.0 2021-09-30 07:00:38 +00:00
Eike Ziller
6ba849ee6e Merge remote-tracking branch 'origin/5.0' into 6.0
Change-Id: I1244ca0b6193d00ded38e5d4c12b605f4e96fdae
2021-09-30 09:00:11 +02:00
Eike Ziller
19ce3e91bb Select project root when opening File System tree with project directory
When choosing "Show in File System View" from the context menu of a
project root node in Projects view, the File System view should show the
project root directly, not the project directory as a child in the
"Home" or "Computer" directories.

Change-Id: Id2d5794cf747fd6b52289f6d08ef14ef18cd2dd4
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-09-30 06:48:03 +00:00
Eike Ziller
258b4f7c23 Show useful root directory when opening File System view
Show the active project's root directory.

Fixes: QTCREATORBUG-26297
Change-Id: Id66131582484e6d8d58ee67226bc1123609e5a7c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-09-30 06:47:42 +00:00
Christiaan Janssen
525039daeb QmlProject: port changes from QtForMcus
Task-number: QTCREATORBUG-26041
Change-Id: I5068381fb2c4c901d8621e0b8358db77d2cb0b21
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-30 06:19:46 +00:00
hjk
67c0104b8e Git: Take Prepend to PATH into account again, take #2
Amends b5a4d38022, which uses FilePath::searchInPath
which does not exist in 5.0.

Task-number: QTCREATORBUG-26329
Change-Id: I94ac35cc95a47e4f82c6205ad24d8bdc69ddf1af
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
v5.0.2
2021-09-29 19:01:03 +00:00
hjk
faba85a2c3 TaskHub: Add #include <QThread>
Change-Id: I395252692fedb547bc0927f2c2838d674bbd56ee
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-09-29 17:27:23 +00:00
hjk
3ad9c64977 ProjectExplorer: Clean up some #includes
Change-Id: Id5a826ff0681a1990f4eeebf1bfc7573e162e861
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-29 16:23:40 +00:00
hjk
b5a4d38022 Git: Take Prepend to PATH into account again
Task-number: QTCREATORBUG-26329
Change-Id: If4ac35cc95a47e4f82c6205ad24d8bdc69ddf1af
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-09-29 15:42:32 +00:00
hjk
bb9bfa1cd4 ProjectExplorer: Allow devices to report tasks in validate
And use it to report a hard error when docker devices don't have
a shared directory set. While this is possibly too harsh in the
long run it fits the current situation where we want to use the
container for building projects.

Change-Id: I1430716b5722fba537bb964463ce25c7001be6a4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-29 13:09:38 +00:00
hjk
4bbab39467 Use FilePath in several file wizards
Change-Id: I9bab9d602096a3872f73fb16d901b8aedcd82516
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-29 13:09:27 +00:00
Christian Kandeler
324105febe ClangCodeModel: Fix a test
The missing header file threw off parsing for some of the code below.

Change-Id: I29f7895b4d88856cc39fd8e33742a37734953b9e
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-29 13:05:04 +00:00
Jarek Kobus
b798fce465 Don't call TaskHub::addTask() directly from non-main thread
Fixes: QTCREATORBUG-26335
Change-Id: I23323edd32fa1f8d5d49943e3b4c37a305e53dd2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-29 12:15:23 +00:00
Alessandro Portale
b2e4930d87 McuSupport: Small virtual/final cleanup
Change-Id: I5a187a6b573326685fb471dc7e31e9731760602d
Reviewed-by: hjk <hjk@qt.io>
2021-09-29 11:11:22 +00:00
Johanna Vanhatapio
34cdffa89b Doc: Update info about camera components
Task-number: QDS-4888
Change-Id: I7fe351d34953d3a5a59397818b92d93139aa81c6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-09-29 11:07:30 +00:00
Eike Ziller
050af56000 Merge remote-tracking branch 'origin/6.0'
Change-Id: If773f217a9708ce0ad0b8adeefe3266ba0371a32
2021-09-29 12:54:38 +02:00
hjk
eedf02e40f Incredibuild: Use more FilePath in CommandBuilder
Change-Id: I31e2be7cbd8f5ac58db4bead1fa3266bb80df868
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-29 10:52:15 +00:00
Assam Boudjelthia
ba672d1334 Android: Do some refactoring for AvdDialog class
Move some logic for avd creation to the AvdDialog, and some
refactoring and simplification.

Change-Id: Id65e586ab1c0e9e898a04f07d7707371f20da649
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-29 10:27:32 +00:00
The Qt Project
50e587fd99 Merge "Merge remote-tracking branch 'origin/5.0' into 6.0" into 6.0 2021-09-29 10:09:27 +00:00
Vikas Pachdha
624df6ec44 Doc: Add Qt-Bridge plugin docs for adobe XD
Task-number: QDS-4615
Change-Id: Ie3c7d814fbf59841f112315cf71553076ec7e0d7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-09-29 10:02:06 +00:00
Christian Kandeler
5e9ac00f19 ClangCodeModel: Replace FIXME comment with link to upstream bug report
Change-Id: I90524adbbc4481cb3e1a3c1bf40ae543cdaf6cd0
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-29 09:59:59 +00:00
Christian Kandeler
29c0512416 ClangCodeModel: Do not use clangd for completing #ifdef & friends
Annoyingly, LLVM does not complete preprocessor directives in disabled
code, so that we would not offer e.g. "#endif" after "#if 0" (but we
would offer it after "#if 1").
Fixing it would require messing with the clang libs (rather than just
clangd), so let's just keep using our existing code, which seems to work
fine.

Change-Id: I9dabf9a2a8f3a2f68e88a11b62c3df3b5e64a55c
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-29 09:31:33 +00:00
Christian Kandeler
94a59f15c6 ClangCodeModel: Replace a TODO item with a version check
Change-Id: I22911b5bc5da3e905d1f31ac1bb19251058a5471
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-29 09:30:49 +00:00
Christian Kandeler
7b53ce3439 ClangCodeModel: Replace FIXME comment with link to upstream bug report
Change-Id: I0ad5c67a481b72d637a4ea8793a7c6cb7b263a30
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-29 09:30:00 +00:00
David Schulz
958ce4f308 Docker: assert and return false if runInShell fails
Change-Id: I0e285e84db1b5442fb4b761597d25e798ac4e94f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-29 08:28:20 +00:00
Alessandro Portale
c44478f0fe Android: Fix FilePath usage (string vs. userInput/Output)
Important on Windows

Change-Id: I0a3041e28ad60f28544ecdab2f6153b7931939f2
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-09-29 08:25:09 +00:00
Eike Ziller
aa22e98b1d Merge remote-tracking branch 'origin/5.0' into 6.0
Change-Id: Iaa5a0fea546d4f28dbceae0458a325077ed382b7
2021-09-29 10:18:48 +02:00
hjk
67a8cfb62a Debugger: Use FilePath in debuggersourcepathmappingwidget.cpp
Change-Id: I83f9cd55ab4c77609fbd3d2ae0d851de3c5145a3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-29 08:17:04 +00:00
Eike Ziller
45e23e07a8 Fix build on macOS
Amends 901a96231c

Change-Id: I4ebc961bed63a9f5a8fc3a997d0c861d779d0c11
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-29 08:12:07 +00:00
hjk
66bf957618 Vcs: FilePath-ify VcsManager::promptToAdd
And adjust users a bit.

Change-Id: Idb31030b208403e88c5be0171b3ca9d4d7ded35d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-09-29 07:44:17 +00:00
hjk
b115de563c ProjectExplorer: Move user path conversion closer to the edge
And replace some foreach().

Change-Id: I788e112c0e314f5514af22dabd111f9cdb64dca5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-29 07:39:37 +00:00
hjk
b237db519b Debugger: Use FilePath for core files and surroundings
Change-Id: Icd648147ee907a2c5ba75042f003229bbd9226fe
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-29 07:35:06 +00:00
hjk
18ea62d844 Core: FileSystemFilter code cosmetics
Namespaces.

Change-Id: Iaab4a85a5dbc6a4dd6571d3705f6b7362b47762e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-29 07:34:36 +00:00
Marco Bubke
e3bbb2fdb6 QmlDesigner: Fix qHash warnings
Change-Id: I2f281fb8ea1751ead1935d0b2e62d9325aee59e0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-29 07:32:50 +00:00
Alessandro Portale
ceae67022c Icons: Fix icon export script
The export script is designed to first let Inkscape export all .pngs,
and then to optimize the .pngs via optipng.

This used to work with previous Inkscape and Python versions.

A few Inkscape and Python versions later, however, the optimizing phase
starts already while the exporting is still happening. That can leave
.pngs unoptimized.

This change defines the stdout and stderr channels as subprocess.PIPE in
the subprocess.Popen call. That restores the intended behavior with
current Inkscape and Python versions.

Change-Id: I3b2775cc24b33ffb181c3b24e545f8cf98244103
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-29 06:41:20 +00:00
Petar Perisin
31b42db4b6 Follow symbols with Ctrl+LMB and Ctrl+Alt+LMB
Change-Id: I85620ad43cdd385d2a4666c874b9c48263d3dffd
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-29 06:28:06 +00:00
Eike Ziller
582342eb62 Fix description of "Files in All Project Directories" locator filter
Change-Id: I422d8abc1ba54559bc98106c1144d9ad5dccef4a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-29 06:17:17 +00:00
Andre Hartmann
2dfb9ff539 RemoteDialog: Fix button states after adding remote
As adding a remote leads to a model reset which does not
trigger the selectionChanged signal, all buttons were
enabled despite no remote was selected.

Change-Id: I2f752fcf5f1830728d1bcf9810ca4648bd2f287b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-09-29 05:41:28 +00:00