Commit Graph

62421 Commits

Author SHA1 Message Date
hjk
4d3374d23a Utils: Drop .exists() check in some FilePath functions
... when it is implicit by other checks in the same expression.

Change-Id: I10c6bd92e4890bdf611f3a222dc6c2d271e98f37
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-04 06:03:26 +00:00
hjk
2373c69e47 QmakeProjectManager: Proliferate FilePath use
Change-Id: Ife92980a179a2872e4dd5083b60bbd0561be55bc
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-10-04 06:02:32 +00:00
Mahmoud Badri
9e38e710d3 QmlDesigner: Allow dropping external assets
External assets can be dropped to Form Editor, 3D Editor, Text Editor, and Navigator.

Fixes: QDS-5045
Change-Id: I2de06ab118350a8d0809b286c16d06e7edea92e4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-01 15:02:29 +00:00
Thomas Hartmann
a07112258b QmlDesigner: Disable Timeview and CurveEditorView when widget is invisble
Task-number: QDS-5159
Change-Id: Ibae0b9742d4aaac6a1def1c84342a031baf75256
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-10-01 14:03:45 +00:00
Christian Kandeler
d52e7b9398 LanguageClient: Make sure to run callback in all code paths
... when receiving a reply for textDocument/definition.

Change-Id: I08f3a22f7c39a33b7b84539125a76d0c0d625692
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-01 11:40:38 +00:00
Christian Kandeler
ec7c60cd67 ClangCodeModel: Do not report non-type template parameters as types
... with clangd.

Change-Id: I9edad375eacc6c33a833c88da64dc29f79334157
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-01 11:40:08 +00:00
Cristian Adam
0665a9151c CMakePM: Scan files only on CMake configuration failure
The file tree scanner will only be started on CMake configuration
failure to generate the <File System> fall back project node.

Change-Id: I873ef1189fd43dc9bffa03aeafabb00bb3b8b6af
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-10-01 10:26:37 +00:00
Thomas Hartmann
c026a100a4 QmlDesigner: Do not mark file as changed for "formeditorColor"
Task-number: QDS-4044
Change-Id: I52a3707edeee8c2204fb67d8101d2a0e99af06ae
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-30 15:59:58 +00:00
David Schulz
442bf39939 Utils: swap anchor and position of Utils::Text::selectAt
selecting now from column to column+length

Change-Id: I34fdf2d3db7fb15687b973094b2ca063b5c6587c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-30 14:09:37 +00:00
hjk
fcfdfdf823 ProjectExplorer: Settingspage code cosmetics
FilePath, namespaces, indentation.

Change-Id: I77a3595bad01c1984bf23cd12ba06d90d58a71ea
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-30 13:28:12 +00:00
Miina Puuronen
d0a4fc4b2c QmlDesigner: Implement a horizontal layout for Component Library
The view from vertical to horizontal is changed with Loader, depending
on Library's width. Vertical layout (old) is mostly the same as before.
Added new property categorySelected for categories. Items are also now
hoverable.

Task-number: QDS-4764
Change-Id: I031f3916f0d011fd76a963b247c238997d7a55d8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-30 13:07:56 +00:00
David Schulz
d6cc280920 CppEditor: use selection(Begin/End) to check local renamings
Instead of relying on the fact that the position < anchor use the
appropriate QTextCursor functions that return the required information.

Change-Id: I019e714f9f764dea6a613f1072928437d0ebb671
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-30 12:19:09 +00:00
hjk
be4cfd9d07 Qnx: Use more FilePath for paths
Change-Id: I36f00548247cd34bbb52b452bc80978f131e5270
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-09-30 11:57:05 +00:00
David Schulz
7df00776d1 LSP: Add support for activeParameter of SignatureInformation
Task-number: QTCREATORBUG-26346
Change-Id: Ieab18f08e4f1b9fa6cacfae0a18310af4bc35165
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-30 11:37:29 +00:00
Christian Stenger
416ea51494 Android: Fix compile
Amends b7c15d4d8d.

Change-Id: I613476daa551cf52ef3b5e905868d027156b6826
Reviewed-by: hjk <hjk@qt.io>
2021-09-30 10:26:47 +00:00
hjk
7a20a8e70a Docker: Split early return in tryCreateLocalFileAccess()
For easier debugging.

Change-Id: I427ec3ce10b3eae50a3fa67d5bba9951e9de4c14
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-30 10:04:24 +00:00
Samuel Ghinet
32799b3a7b Make additional changes in the QtCreator side required for QDS new project dialog
* We need to use the CheckBox field to set the checked state of fields
  (TargetQtVersion, Use as default project location).
* When the validation of the Project Name or Project Location fails, we
  need a way to be notified of what went wrong. We also need a way to
  force the project intro page to execute the validation of those fields
  whenever we need (i.e. when the user types into our QML TextField
  controls)

Also, add a warning on loading wizards: whenever a wizard.json file
cannot be parsed, we should issue a qWarning(), so that we can more
easily notice when something went wrong.

Task-number: QDS-4490
Change-Id: I7cfa61b4e43d731db9d0679e093e723d947b60c0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-30 09:41:04 +00:00
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>
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
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
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