Commit Graph

62421 Commits

Author SHA1 Message Date
Christian Stenger
0f552a4f28 McuSupport: Fix some warnings
Change-Id: I641a31ed18bb804ffe081852dcfb39499f24c30f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-10-27 06:40:51 +00:00
David Schulz
6cc6e854a6 Debugger: map stack frame paths to the device of the debugger
Change-Id: If20617faf63a6b934455267f5e9512e5c555e144
Reviewed-by: hjk <hjk@qt.io>
2021-10-27 06:40:11 +00:00
David Schulz
673e90b9de Debugger: show destribution debug package message for remote frames
Change-Id: Ie9f7b553357c0f041d266874d284504159708cd9
Reviewed-by: hjk <hjk@qt.io>
2021-10-27 06:29:07 +00:00
David Schulz
bc55c7cc70 Debugger: use FilePath in stack frames
Change-Id: I98b6aa60e1b72be3482916446b87cee89e6cf2a4
Reviewed-by: hjk <hjk@qt.io>
2021-10-27 06:28:56 +00:00
David Schulz
67607e4bc6 Debugger: adjust inferior paths for remote debugger
Change-Id: I251c7a69b6595848c737c2547d22d8e0a4f2076a
Reviewed-by: hjk <hjk@qt.io>
2021-10-27 05:34:28 +00:00
hjk
405daf4f51 QmlDesigner: Compile fix
Amends a393bcec38.

Change-Id: I00868a0de43d86b435f64e97725a0a66bd01266e
Reviewed-by: hjk <hjk@qt.io>
2021-10-27 04:07:29 +00:00
Assam Boudjelthia
d5a3435798 Android: drop const from AndroidConfigurations::currentConfig()
Since the config can be expected to modify configuration values
(e.g. setEmulatorArgs()) it shouldn't be const, but can be set
to const whenever creating a reference that is not meant for
modifying the config.

Change-Id: I8c816a5422d4d57afa158c723d908e3a9a9a0db8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-10-26 18:34:58 +00:00
Christiaan Janssen
0eeb6c6e5e McuSupport: support for SDK 2.0
This is a quick fix for the current situation. Proper
support will need a rewrite of part of the plugin code.

QtQuickUltralite SDK 1.x relies on environment variables
for the dependencies. SDK 2.x uses CMake variables for that purpose.
Some of the variables have been renamed, others grouped together.

Here a mapping between those is hardcoded as an urgent solution.
A proper implementation should make the plugin independent of
the existence or lack of specific environment variables. Also,
all the hardcoded information needs to be moved to the json kit
files in the SDK. Otherwise, compatibility breaks between versions
every time the built-in assumptions relating to that information change.

Task-number: UL-4396
Change-Id: I7f40a694a773881f20b29bae9d02c7c1c8bd747b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-10-26 16:00:30 +00:00
Ivan Komissarov
9edecd1c94 Update Qbs submodule to the top of 1.21 branch
Change-Id: Ia722129e6c0b25c20600a9191656ee70af32435d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-10-26 15:03:35 +00:00
Assam Boudjelthia
5ab9d45c5f Android: Add and organize error cases for different steps
Add error messages for cases in the different steps (e.g. build, deploy,
etc.) for user. This makes it easier for the user to know what's wrong
instead of just failing with no explanation.

Change-Id: I96ea65f5c73edf14c2214b699503211b740d029c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-10-26 14:50:46 +00:00
Miikka Heikkinen
a393bcec38 QmlDesigner: Recognize subfolders as modules at any depth
Fixes: QDS-4787
Change-Id: If4e474ba0bc5f23e8a3cbf7bc6b5c7715fe467dd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
2021-10-26 14:26:10 +00:00
Eike Ziller
74e29eaa26 macOS: By default use dark theme in system dark mode
Like already done for Windows.

Change-Id: I7919ecb92da5d4baeedf2068f09c341d39728ecc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-26 13:03:00 +00:00
Eike Ziller
d977db303d macOS: Force light appearance before saving system palette
When using a light theme while macOS is in dark mode, we need to first
force the application appearance to be light, before saving the system
palette. Otherwise the system palette will contain colors from the dark
system appearance.

Fixes: QTCREATORBUG-21520
Fixes: QTCREATORBUG-26427
Fixes: QTCREATORBUG-26428
Change-Id: Icf802093de17715d16db5c5735b133f2fc465436
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-26 13:02:46 +00:00
Tapani Mattila
0fc1bb6187 CMake file generation: Generate main.cpp and main.qml
Task-number: QDS-5254
Change-Id: Ide893002df72adde77ef018482a4bd13c207780f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-26 12:57:16 +00:00
Tapani Mattila
46d9fa36df Fix CMake file generation to include module subdirectories properly
Task-number: QDS-5273
Change-Id: Id32ef746851a51a54941359548d0e35608f282a5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-26 12:56:42 +00:00
Eike Ziller
c23b2ac7e6 iOS: Fix retrieval of developer teams with Qt 6
Qt 6 fixed the representation of certain plist file structures in
QSettings. This leads to a different layout of the QVariantMap that we
get for the information about developer teams.

Fixes: QTCREATORBUG-26111
Task-number: QTCREATORBUG-24098
Change-Id: I18514bda4d9a96bbbf13ed0b7159019778d0862d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-26 12:44:16 +00:00
Leena Miettinen
ddfea6b648 QML Designer: Fix UI text capitalization and punctuation
Task-number: QTCREATORBUG-26458
Change-Id: Ifffb7e155bf75a47dec9d4bd9842c4acd5aaf2a7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-26 11:59:37 +00:00
Miikka Heikkinen
ea1cf9125e QmlDesigner: Inject QtQuick.Controls into possible imports if necessary
In Qt6, QtQuick.Controls module itself doesn't contain any versioned
types, so it will only appear as unversioned module in the QmlJS
snaphot. It is still valid import, as behind the scenes it will import
QtQuick.Controls.impl, which has the versioned types. However, QmlJS
can't handle this case, so we work around it by including
QtQuick.Controls as a possible import if corresponding .impl is
a possible import.

Fixes: QDS-5182
Change-Id: I6cc73ccaee0c16f0bcd09e4279cba411a76b45f2
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-26 11:44:11 +00:00
Miikka Heikkinen
6ef7010a95 QmlDesigner: Handle implicit components properly in componentview
Made component view react to node source changes in order to properly
show implicit components in the edit subcomponents dropdown.

Fixes: QDS-5237
Change-Id: Ibe39e6f5c30f19e4067f8cbc95f240d82165e982
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-26 11:42:51 +00:00
Mahmoud Badri
01164e737d QmlDesigner: Add a Text component when dropping a font to Form Editor
When dragging a font from the file system and dropping it on the Form
Editor, create a Text component.

Fixes: QDS-5272
Change-Id: I3ec9420f870732afac7d09688f1e459881d4aad3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-10-26 10:18:11 +00:00
Eike Ziller
74454a3531 Open project folder in File System view
If no editor is open and syncing of the root is on (the default):
- make "Projects" or the last opened project the default root
- switch to project root when project is opened

If an editor is open, everything stays as is.

Fixes: QTCREATORBUG-23632
Change-Id: Ie409e2ef676fe933cb4b7f32f2347fea19e5927e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-10-26 09:29:35 +00:00
David Schulz
665285b981 Docker: Map build directory to device in cmake calls
Change-Id: Ibcd2e1aebac337e880a28a2a22b35d8ca60b6dcf
Reviewed-by: hjk <hjk@qt.io>
2021-10-26 07:38:55 +00:00
Eike Ziller
588ef08d46 Merge remote-tracking branch 'origin/6.0'
Change-Id: Ib49e73e6c69d71fd0d8402c08f4344476295e409
2021-10-26 09:15:45 +02:00
The Qt Project
2316f07db5 Merge "Merge remote-tracking branch 'origin/5.0' into 6.0" into 6.0 2021-10-26 07:13:53 +00:00
Eike Ziller
e8ba5b75cf Merge remote-tracking branch 'origin/5.0' into 6.0
Conflicts:
	src/plugins/android/androidpackageinstallationstep.cpp
	src/plugins/cppeditor/cppmodelmanager.cpp

Change-Id: I3bad38e1cfe717e98209d49461c9813a8e555eff
2021-10-26 09:13:24 +02:00
hjk
c82e3cf6a8 Utils: Map local path path in FilePath::onDevice(), too
To cover cases like Windows -> Docker/Linux, where these parts are not
an exact 1:1 mapping.

Change-Id: Iecc26e06771fb190644988950271ff7990962b6b
Reviewed-by: hjk <hjk@qt.io>
2021-10-26 07:01:13 +00:00
David Schulz
712caf10dc Docker: allow local build directories
Used for local projects with kits that have a remote build device

Change-Id: I8604c4673fc0f1571fe62407334c1e26e71fd2a8
Reviewed-by: hjk <hjk@qt.io>
2021-10-26 04:32:10 +00:00
David Schulz
c19d031978 ProjectExplorer: introduce Toolchain::priority
Can be used to prefer certain toolchain types over other if different
toolchains matches the same abi.

Change-Id: Ie1c62e8abfc98e8cda7f999c4df487799c8d4f13
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-10-26 04:31:29 +00:00
Leena Miettinen
e95778707b Debugger: Fix UI text
Task-number: QTCREATORBUG-26458
Change-Id: I6625d30e2eb2d2fcca87360f84d50109632071f2
Reviewed-by: hjk <hjk@qt.io>
2021-10-25 15:19:38 +00:00
Leena Miettinen
6739266a8e Docker: Fix UI text
Task-number: QTCREATORBUG-26458
Change-Id: I6dcdbf199259259416e4bfb11c3488f8594b0c0b
Reviewed-by: hjk <hjk@qt.io>
2021-10-25 15:18:14 +00:00
Leena Miettinen
354c6405c3 Android: Fix UI text
Task-number: QTCREATORBUG-26458
Change-Id: Ibc407db46a605c6bde8f994af63f678a5a102b0e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-10-25 15:18:00 +00:00
Leena Miettinen
dcd4d1c92e Launcher: Fix UI text
Task-number: QTCREATORBUG-26458
Change-Id: I99ffa236a58dd9bdad9716edfdd7a576293144d8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-10-25 15:14:33 +00:00
Artem Sokolovskii
a013d75728 CppEditor: Change parsing opposite bracket
Fixed behavior:
- when comparing sign was determined as angle bracket
- when in complex combination brackets, an opposite bracket
was detected not correct
- not correct mismatch case highlightning
Added tests for the cases form bug 26395

Fixes: QTCREATORBUG-26400
Fixes: QTCREATORBUG-26395
Change-Id: Ic45566d2677f80fb9a8e4fe830307254dd1db51d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-10-25 14:07:44 +00:00
David Schulz
5a2b58550e Debugger: use Qt version from kit as fallback for dumper
Fixes: QTCREATORBUG-26456
Change-Id: If2cd664212b3fa07d7abaef7a1173f79716884bb
Reviewed-by: hjk <hjk@qt.io>
2021-10-25 12:06:18 +00:00
Eike Ziller
ec422648ad Examples: Fix image scaling for Qt 6
For Qt 6 we must manually convert images to a larger image space before
rescaling, otherwise we get dithering effects.

Fixes: QTCREATORBUG-26462
Task-number: QTCREATORBUG-24098
Change-Id: I0d7bb70003822d61d6bc4bc571d29ef82c4dbb0e
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-10-25 11:44:05 +00:00
Assam Boudjelthia
f4db436a7b Android: remove Virtual from the AndroidDeviceFactory
Keep it only Android Device since this title is used in many places
around Qt Creator in different contexts it is better to make it
"Android Device" to not give any unintentional hint that only virtual
devices are covered. Such cases are the project creation wizard and the
kit target device settings.

Task-number: QTCREATORBUG-26477
Change-Id: I8c7224243aec6b8f5b5bf95db8d23b9aecbafca6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-10-25 10:31:18 +00:00
Assam Boudjelthia
43f759a6b0 Android: remove unauthorized field form AndroidDeviceInfo
This is not really needed anymore, it was mainly used for physical
devices to report whether they need user authorization to be used
via adb. This is now handled by IDevice::DeviceState, where a
Connected device is unauthorized, otherwise any physical device is
ReadyToUse if authorization is good.

Change-Id: If5c1e49b98063eabe4205cd8adb5b11515e1e1de
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-10-25 09:22:08 +00:00
Assam Boudjelthia
ec55b1a483 Android: remove AndroidDeviceType and State from AndroidDeviceInfo
No need to have these enums which are now only a duplication of
IDevice::MachineType and IDevice::DeviceState.

Change-Id: Icc3f112f2670c7354bb282b36fad0f0631b9e047
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2021-10-25 09:21:37 +00:00
Assam Boudjelthia
affe3ccf51 Android: Make refresh action device specific
Change-Id: I18386ad88e04696068f5f127cadb7ffcc6f25a56
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-10-25 09:21:22 +00:00
Assam Boudjelthia
fbcb45c105 Android: get build dir based on settings file path for qmake projects
Check Constants::AndroidDeploySettingsFile path first, and use
the buildTarget's workingDir only if that former value is empty.

Fixes: QTCREATORBUG-26357
Change-Id: I726a4b5cd60042845988b4428eea03ef0adb9920
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-10-25 09:20:23 +00:00
David Schulz
12bc192422 Docker: mount python dumpers to device
Change-Id: Ic0d67b4a18247439f5797a0dcf74df945ef6f61e
Reviewed-by: hjk <hjk@qt.io>
2021-10-25 08:56:16 +00:00
Christian Kandeler
6f26a1545c ClangCodeModel: Check doc revision when highlighting with clangd
Change-Id: I981d375e3656e89bb66516218e3f4e33ee8bbb9e
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-25 08:45:07 +00:00
Christian Kandeler
2eb50afd9c LanguageClient: Fix document version update
... for empty semantic tokens delta.
Amends 86061fb44a.

Change-Id: Id6d6cdc1904ea5353d18cea57b55ed3fa16727de
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-25 08:43:11 +00:00
David Schulz
d84de31384 Docker: Map command executables to device path
Change-Id: Ia8edf686a546f57b42ed0141e2986eded6f96ec1
Reviewed-by: hjk <hjk@qt.io>
2021-10-25 07:33:03 +00:00
Jarek Kobus
474ce0399d Ignore the wheel event explicitly in order to propagate it further
Qt 6 brings a behavioral change regarding delivery of wheel events:
92df790f46b3a8b17aec2f385d6472fd3f8647f6 and
2a857ee28315c5bacfe2ecaf402ca9005b35c20e. If there is an event
filter installed and wheel event is being processed, the event
is now accepted by default, which means that after returning
true from eventFilter(), the event is not propagated anymore.
Since we want to redirect the event to the parent HelpViewer object,
we explicitly ignore the event prior to returning true.

This patch fixes the QTextBrowser backend.

Amends 0b96a1b76b

Fixes: QTCREATORBUG-26369
Change-Id: I7a0167c54f830fffab13d73eb91cb2ecbd730c86
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-10-25 05:48:56 +00:00
Christian Kandeler
404cf0f632 CppEditor: Mark generated setter as slot only for QObject-derived class
Fixes: QTCREATORBUG-25789
Change-Id: I79174bcd617eb54540009491031cfae380383c41
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-22 12:34:51 +00:00
Eike Ziller
b2cdfccf54 Make File System view independent from ProjectExplorer
As preparation for moving it to Core so the "Show in File System View"
functionality can spread more.

Change-Id: I0f7d36f1d7eebe7b074c7949dd95b2cd985bfec8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-10-22 11:13:10 +00:00
David Schulz
86061fb44a LanguageClient: save document version for semantic tokens
Change-Id: Icd17e7f140cd172b2515711a3562c479f0ad488d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-10-22 09:23:27 +00:00
Christian Kandeler
9f7cdd6d3c CompilationDbProjectManager: Fix tree scanning
- We checked for the QFuture's canceled status at a time where it would
  always yield true.
- A pointless default value was used for the project root path.

Fixes: QTCREATORBUG-26356
Change-Id: I4d17c6ecb7e9e7e71df737d85b42feb37d3ead5d
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-22 09:06:09 +00:00
David Schulz
0a7935d449 ProjectExplorer: fix comparing toolchains on redetection
Use the specialized operator== of ToolChain when looking for priorly
defined autodetected tool chains.

Fixes: QTCREATORBUG-25697
Change-Id: I477d29695eef2acb1ba566d42df9b1e57d26eb07
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-10-22 08:12:52 +00:00