Commit Graph

71402 Commits

Author SHA1 Message Date
Christian Kandeler
78d6c0a15e ClangCodeModel: Adapt test to upstream fix in clangd
See https://reviews.llvm.org/D111224.

Change-Id: Id880468976e9036aa0c6212905101050ff43e34b
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-27 09:18:58 +00:00
Christian Kandeler
560d16a096 CppEditor: Follow symbols in generated UI headers to .ui file
Fixes: QTCREATORBUG-2374
Change-Id: I784fe39c11c834525cdd37ca719efa65efcb307c
Reviewed-by: hjk <hjk@qt.io>
2021-10-27 09:17:49 +00:00
Eike Ziller
dc5717bd06 Move File System view to Core plugin
So it can be accessed from a wider range of places.

Change-Id: I282883addecf7bb070a65d9f4f7b8e6e2e4b5e47
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-27 09:02:23 +00:00
David Schulz
d849643cb0 QmlJS: fix building tests
amends d68bb4687c

Change-Id: I7fc5b260a7748829038b8494e75e4cfc5a56945b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-27 08:46:04 +00:00
Leena Miettinen
b67482480e Doc: Update the Qt Quick Mobile application tutorial
Remove references to using visual editors and use the example code
from Qt Sensors module.

Add instructions for using CMake.

Add CMakeLists.txt, AndroidManifest.xml, and Info.plist files.

Change-Id: I956379fdf7d39161f571893d56250ec2dd2f5ddd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-10-27 08:40:52 +00:00
hjk
d68bb4687c QmlJS: Proliferate FilePath and QtcProcess use in QmlJSPluginDumper
Change-Id: Ie483bb2e9b5d812d380470949564a6bc57801fa9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-27 07:57:13 +00:00
David Schulz
d6c3a7297d Editor: fix clipboard collecting via mouse selections
Fixes: QTCREATORBUG-26471
Change-Id: I08264204c5ea5753b326417e5ba3a451cc6ef8f6
Reviewed-by: hjk <hjk@qt.io>
2021-10-27 07:56:45 +00:00
Jarek Kobus
0556eec9b7 Use a new enum indicating various start failures
Before the m_startFailure flag was used to detect the case
when the process failed to start because of wrong filename.
As this flag was set on any possible error we have always
detected the wrong filename case. Replace this flag with a
new enum describing various start failures.

Don't report again the crashed message. Check if we have already
reported the stop and we don't report it again. The
processExited() handler is being called twice: directly from
localGuiProcessError() and through the delayed localProcessDone().

Fixes: QTCREATORBUG-26467
Change-Id: I3cc6aa0c0b702256cefd77ba95793cd31e82ae10
Reviewed-by: hjk <hjk@qt.io>
2021-10-27 07:53:53 +00:00
hjk
de2423f514 Docker: Remove DockerRunConfiguration
This was a helper in the initial work on docker support which has
been commented out for a while already.

Using "docker runconfig" would technically work, however, this is
conceptionally the same as the old "matrix problem": We'd need
docker-specific almost-duplicates for every existing non-docker
runconfig. This does not scale.

Change-Id: Idf96abb6487903fdb89e7168a5ed78b9dc9dcecf
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-27 07:24:35 +00:00
Jarek Kobus
4b6b9f4dec Don't instantiate QTimer and QEventLoop for every QtcProcess
These two objects are only used when QtcProcess::runBlocking()
with m_processUserEvents option set is called, otherwise
they are unused. Create them only when they are needed.

This also solves the issue that these two QObjects were not
moved together with QtcProcess when it was moved to another
thread.

Change-Id: I7de6a92a51fc249184fc5811dac7a7bbf05d351f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2021-10-27 06:43:01 +00:00
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
Eike Ziller
296b9b700d Update change log for 6.0
Change-Id: Ifb0aacc979910a9de1ea56d9ed31f856a0dbf376
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-10-26 20:08:25 +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
Henning Gruendl
73fb9d7002 QmlDesigner: Expose state property for 3DObjects
Task-number: QDS-5225
Change-Id: I08b5839ef70dd3e3ea9ebd615646494e3667a479
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-26 17:54:54 +00:00
Henning Gruendl
92cb2427f8 QmlDesigner: Fix hex label eliding in ColorEditor
Change-Id: I144511f8cfe4caabaf84d19331a6cb4222884cdf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-26 17:54:46 +00:00
Henning Gruendl
260d323a85 QmlDesigner: Fix GradientPropertySpinBox dragging
Task-number: QDS-3081
Change-Id: Ibcd7d79fbff42bb41a009de37f7200aa50b56827
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-26 17:54:38 +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
Miikka Heikkinen
f0d0ce4c01 QmlDesigner: Do not create pixmap at component completion
Creating an item pixmap will render the entire scene and clear all
dirty flags, so we don't ever want to render just one item without
checking if other items need rendering, too. So pixmap creation is
removed from completeComponent(). Since completeComponent()
already inserts the completed instances to the dirty instance set,
this should not cause any problems; it just defers the rendering to
the next collectItemChangesAndSendChangeCommands() call.

Fixes: QDS-5271
Change-Id: Ic15dbb29f13875b966f4e3c3556a4ecd7194cdd6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-26 12:50:08 +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
Christian Stenger
afda00f1fa QmlJS: Update version information
Fixes: QTCREATORBUG-26273
Change-Id: I3a2c7c0d11436655a87d6288412af95ff3ffdaaf
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-10-26 04:25:25 +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
Leena Miettinen
cd80f0a096 Wizards: Fix description of Qt Application template
The applications can also be run on the mobile device platforms
listed in the wizard dialog.

Task-number: QTCREATORBUG-26477
Change-Id: I845d95c5ca46804691613177d7e285246b1593ba
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-10-25 15:00:01 +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