Commit Graph

74059 Commits

Author SHA1 Message Date
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
David Schulz
23a58a320e clangd: introduce ClangdCompletionItem
allowing to overwrite apply and get rid of the apply helper in the
LanguageClient completion provider and processor.

Change-Id: I066fe10b116d638bd1b7a81d4488840bec5f0b63
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-29 04:41:06 +00:00
Ivan Komissarov
99817d3870 Update Qbs submodule to the top of 1.20 branch
Change-Id: I39d2bd127b0dc75d24614fd1a30b50be71a8d4ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-28 16:03:11 +00:00
Alessandro Portale
191bab9ecd Welcome: Add a dedicated session settings icon
The re-used toolbar settings icon from Utils appears a bit small in
comparison to the other icons on the welcome screen.

This change adds a dedicated, properly sized "Settings" icon which fits
better.

Change-Id: I8af239a93806eaa6f355d504be282691b2463f3a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-28 14:48:04 +00:00
Eike Ziller
3fc5540583 Change log for 6.0
Change-Id: I6a3f711ce94e3ea203a6231064744619bcb6ff24
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-09-28 14:23:42 +00:00
Alessandro Portale
0369dc9977 Apply ManhattanStyle to QCheckBox on a toolbar
And consolidate the palette setting code for QLabel, QSpinBox and
QCheckBox.

Change-Id: If0dea048e2341bcbb35c52eb394d4d01efef88be
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-28 13:52:57 +00:00
hjk
afe60b1669 Utils: Re-do FilePath::toUserOutput()
Use the FilePath's knowledge of the target os instead of always using
the host os.

Change-Id: I996db68486f4616c8636ae501cce7a778269f1cf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-28 13:38:48 +00:00
Christian Stenger
430c48ac1a Tests: Fixup test expectations
Amends b64863806f.

Change-Id: I8df23cc10d71760cacb03eb59b728400a4ef3c61
Reviewed-by: hjk <hjk@qt.io>
2021-09-28 13:18:09 +00:00
Christian Kandeler
e7eeb5ae34 ClangCodeModel: Use namespace TextEditor in clangdclient.cpp
Less noise.

Change-Id: Ia7ec9c6cbe93868826828379ded2d039f6fa3a44
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-28 13:12:04 +00:00
hjk
c252fa9367 RemoteLinux: Use FilePath in GLDCWKDP::privateKeyFilePath
a.k.a. GenericLinuxDeviceConfigurationWizardKeyDeploymentPage::privateKeyFilePath.

Change-Id: Ic17c7b88d3540a5f7c1c983effc3f59f25102528
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-28 12:41:59 +00:00
hjk
42b151e05b Debugger: Proliferate FilePath in CdbSymbolPathListEditor
Take the opportunity to limit scopes.

Change-Id: I709302186b5876058fc9199dec6dd75a9db602a9
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-28 12:41:48 +00:00
Christian Kandeler
901a96231c ClangCodeModel: Cache clangd's AST
Since we use the AST in several contexts, it can easily happen that we
need to consult it more than once for the same document revision.
Therefore, it makes sense to cache the AST to prevent redundant requests
for potentially large amounts of data.

Change-Id: I33100e0052ee21bb46e91848d3d2e8a0a96bb860
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-28 11:34:25 +00:00
Tim Jenssen
3ed8d60756 QmlDesigner: Integrate QmlDom
Task-number: QDS-5172
Change-Id: Ib17c38ef7b89b05daababaad1f8e2dc39d53a2bf
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-09-28 11:32:34 +00:00
Alessandro Portale
05e89384e2 Wizards: Turn icons into themed icons
Turn the current un-themed icons into icon masks which now get recolored
according to the current theme.

Change-Id: I435f9a43dae04797ad0b948992f77179d93164a8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-28 11:31:16 +00:00
Jarek Kobus
7958de05f5 Introduce Utils::Singleton
Introduce Utils::Singleton class and
Utils::SingletonWithOptionalDependencies class template
that helps implementing singletons that depend on other
singletons. It's guaranteed that whenever singleton B depends
on singleton A, than A is always created before B is being
created, and that the order of destruction is always
opposite to the order of creation.

Dependencies of singleton are listed as template arguments
for SingletonWithOptionalDependencies class template.
The first argument of SingletonWithOptionalDependencies
class template is always a singleton class itself.

Prepare a common interface for all singleton subclasses:
SingletonSubClass *SingletonWithOptionalDependencies::instance();

Make instantiating singletons and its dependencies thread-safe.

Create singletons on demand (only if some code needs them).
It's not needed anymore to explicitly instantiate
all required singletons in tests.

Make it possible (and thread-safe) to instantiate ProcessReaper
and LauncherInterface singletons in non-main threads.

Make the following dependencies between existing singletons:
   SshConnectionManager depends on:
-> LauncherInterface depends on:
-> ProcessReaper

Change-Id: Iefaacab561c2b3dcf07e7fafbb87339ea6a15278
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-28 10:25:29 +00:00
Christian Kandeler
03f6de1eeb ClangCodeModel: Properly mark "#ifdefed-out" blocks with clangd
The behavior is now the same as when using libclang. Namely:
    - The whole block is grayed out, rather than just symbols
      having a gray background.
    - Ifdefed-out blocks no longer mess with the brace depth.

Change-Id: I8b5f3a788430edcd9dd79249323c26a5ee5d68ed
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-28 10:23:03 +00:00
Alessandro Portale
e97a8471b5 ProjectExplorer: Make Json Wizard icons themable
Wizard json files can now define via
  "iconKind" : "Themed"
that the provided icon is a themable mask rather than a plain image.

Change-Id: I668b7fe368b6989f3609143b22270cb8cec21b12
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-28 10:20:06 +00:00
Alessandro Portale
ebc6e1fc62 Android: Use Android tools environment for avdmanager call
Otherwise AVD creation fails (on Windows).

Change-Id: Iff11c2cd96c214b40b714b6b1248adede54da343
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-09-28 10:14:59 +00:00
hjk
aa4b825809 Ssh: Use FilePath for SshConnectionParameters::privateKeyFile
Change-Id: Ifaf97cc744f80e1fa0f4000aabf83671b2ffd972
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-28 09:57:41 +00:00