Commit Graph

74059 Commits

Author SHA1 Message Date
hjk
1172eeb060 ProjectExplorer: Introduce device://<deviceid>/...
... to identify a device in a file path.

For use from the sdktool.

This is an addition to the pre-existing way to identify devices
using e.g. docker://<id> or ssh://<ip>/

Change-Id: Ice5481eab550b2fe39eda4c6d74d9c46fa6b6626
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-24 14:27:57 +00:00
Christian Stenger
3ae6f41c3f Squish: Adapt to changed UI
Change-Id: Ie25ba8a72b7fd93f60f04303ed223e7cdf2406af
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-02-24 14:04:51 +00:00
Mahmoud Badri
c077f42e23 QmlDesigner: Fix imported meshes don't appear in a model's source
Fixes: QDS-6329
Change-Id: Iec70492d8dfce4f8a0ce05cbd16991f70b9eb985
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-24 13:02:21 +00:00
David Schulz
4452f71201 LanguageClient: avoid optional::value
Potentially throws std::bad_optional_access. Use operator* and
operator-> instead.

Change-Id: Idefa137da53f3663ea88961f1105b93402ec4777
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-24 12:04:38 +00:00
Eike Ziller
41538832c3 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/libs/utils/qtcprocess.cpp
	src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
	src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp

Change-Id: Id0c31719e46d1c44770ea89663eee321a0517ff4
2022-02-24 11:42:57 +01:00
David Schulz
0ce098ed87 WinRt: enable plugin on Windows 11
Change-Id: Ie935b1baaa4331499143de4eb3fb9bd57b38c347
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-24 10:00:35 +00:00
David Schulz
3cf6d15096 LanguageClient: track all created diagnostic marks
Removing a block results in taking marks of that line out of the
document, but does not delete those marks. So we cannot rely on
iterating over marks of a document to delete all marks for a specific
file. Instead save all marks from text mark creator for a file path and
iterate this list to delete diagnostic marks.

Fixes: QTCREATORBUG-26585
Change-Id: Idc41fce5de4ade68f4a29c23ba02844701b44d3c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-24 05:25:25 +00:00
Thomas Hartmann
ee4757a8e8 QmlDesigner: Use LoggingCategory in ImageContainer
Change-Id: Ibdce399fc2df19883d6ffd12e9441c58d46035ec
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-23 20:47:09 +00:00
Mahmoud Badri
787bbfaf1c QmlDesigner: Fix path when importing a 3D model inside a component
Fixes: QDS-6319
Change-Id: Ia9dbdf9a2d32eaf996cca2ba84e89ca8111dab1c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-23 18:48:06 +00:00
Mahmoud Badri
45364d4327 QmlDesigner: Disable scrolling when context menu is open
Disable components and assets views scrolling when the context menu
is open.

Fixes: QDS-6317
Change-Id: Ibdbf29b14d0383fd2b876c655ccb17c35fdb6aff
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
2022-02-23 18:12:22 +00:00
Assam Boudjelthia
c1512dce87 Android: don't stop deployment if the kit's ABIs list is empty
If for some reason we cannot get the list of kit's ABIs or it's not set,
don't stop the deployment because of that, let it continue and fail
later.

Fixes: QTCREATORBUG-27103
Change-Id: I973e5ffdca1e8fb6af3f6e6438969b38b8e375c8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-23 17:21:51 +00:00
Assam Boudjelthia
0586418f83 Android: Differentiate between same devices connected via usb and wifi
ADB allows connecting the same device via USB or WiFi, so we need
to make sure the name of the wifi which appears as a different device,
make sure it does mean something instead of "Name2" as proposed by
default by QC. So this adds the term wifi to the name to make it clear.

Change-Id: I5923ca2430c8b51ae2525744dcc1f803ab976b35
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-23 17:21:36 +00:00
Thomas Hartmann
ef6fbe373f QmlDesigner: Fix crash
For some files rootFormEditorItem() can be null.

Change-Id: I71672e4d43bfd086011f6a6cb3c93572f6ba0a05
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-02-23 17:01:47 +00:00
Thomas Hartmann
3a210bb811 QmlDesigner: Rename views for consistency
"CurveEditor" -> "Curve Editor"

Task-number: QDS-5852, QDS-6325
Change-Id: I709b54c338708f4387d0d1cb4b928d8eebbfb3be
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-02-23 16:57:27 +00:00
Christian Kandeler
cac1c3d501 Fix more warnings
Found by compiling with clang

Change-Id: Iec0ed8aa8b6a742a5a3996a6c19c410e209fb048
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-23 16:57:25 +00:00
Eike Ziller
fff5944e65 Fix lupdate issues
When updating translations with
cmake --build . --target ts_de
(or other language ID)

- Qualifying with unknown namespace/class ::PluginSpecPrivate
- <class> lacks Q_OBJECT macro

Change-Id: Ic42d8dffea935e6b10e59223bdedb9a8a4dcf446
Reviewed-by: hjk <hjk@qt.io>
2022-02-23 16:53:00 +00:00
Tapani Mattila
24274cd907 CMake project converter: Enable only if project is old format
Task-number: QDS-6250
Change-Id: I41ca02ff76e53cb7470056b2f956b05d2027e773
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-23 16:43:15 +00:00
Jarek Kobus
f1e973de79 RunControl: Drop IDevice * from doStart()
Use device set inside passed runnable instead.

Grep for all usages of RunControl::start().
If passed device wasn't nullptr, set this device
inside passed runnable. Otherwise ensure that
passed runnable contains device set to nullptr.

Change-Id: I06fd42a16246fa9fedd81eeb47481a217f887cb0
Reviewed-by: hjk <hjk@qt.io>
2022-02-23 16:28:01 +00:00
Thomas Hartmann
5c13dd1ac1 QmlDesigner: Optimize setResourcePath()
Only update the resource path if it is actually different.

Change-Id: Iaabe3129c9a094a6166a17cd9cba56c123221fba
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-02-23 15:33:51 +00:00
Jarek Kobus
3f259da6d5 ApplicationLauncher: Treat DesktopDevice as local
Treat DesktopDevice and all derived devices as local
in application launcher.

Change-Id: Ie1a025c03f1c96158c67e0c900f89e33ec7c4663
Reviewed-by: hjk <hjk@qt.io>
2022-02-23 15:26:56 +00:00
Christian Kandeler
52e26a360b Fix newly introduced warnings
Change-Id: I0b9cf3496d536e1173fbd6587e5b491305eb876c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-23 15:26:31 +00:00
Jarek Kobus
10abf43afa ApplicationLauncher: Remove start(IDevice *) overload
Take the device from runnable passed in setRunnable().
If the intention is to run locally, set the device
to nullptr inside runnable. Otherwise we don't run locally.

Follows 47957de2dc

Change-Id: I5b381bb499cf76e469c844ac7474ce2f60761cef
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-23 15:03:30 +00:00
Thomas Hartmann
59982f1ca9 QmlDesigner: Remove superfluous update
Change-Id: I3bc4fc4b480e9cb895357580968c6568e7150cbb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-23 15:01:45 +00:00
Eike Ziller
8e0bc89e64 Mimetypes v3: Fix build with Qt 5
Change-Id: I871952c5c4ed97d04bd7acdb9f4af225f1550b69
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-02-23 13:47:14 +00:00
Eike Ziller
d8be61343a Mimetypes v3: Add dummies for API that was added for Qt Creator
Change-Id: I6216f3f109893bb40ffa06bc0de10965fa7904e2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-02-23 13:47:07 +00:00
David Schulz
98a9dcfeea LanguageClient: show snippets only completion proposals again
This reverts commit 5f1e6b15bf.

We already prevent inserting snippets in some unwanted contexts in
ClangdCompletionAssistProvider::createProcessor.

Fixes: QTCREATORBUG-27051
Change-Id: I292d2816b366df6f0d0b070b7d732c199742fc7e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-23 13:47:03 +00:00
Eike Ziller
f8d7542fe6 Mimetypes v3: Add static wrappers for MimeDatabase
Avoids "MimeDatabase db; db...." everywhere in user code.

Add overload for FilePath.

Change-Id: I68d07f20159d970cd5ee2eab995bab46ef0da669
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-02-23 13:46:54 +00:00
Eike Ziller
f112fd0572 Mimetypes v3: Rename classes
- fix includes
- use pragma once
- use namespace Utils
- rename QMime -> Mime
- fix exports
- don't use QFileSystemEntry
- don't use QT_REQUIRE_CONFIG
- disable QT_CONFIG(mimetype_database)

Change-Id: I3e27b7644a9db987ad213efada3b0d8c7199cfd9
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-02-23 13:46:42 +00:00
Eike Ziller
88d892c13a Mimetypes v3: Rename files qmime... -> mime...
Change-Id: I0e36b52124295d07c3ca2d16aa4593dbde3a888d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-02-23 13:46:37 +00:00
Eike Ziller
e2ccf20c66 Mimetypes v3: Copy version from Qt 6.3
State from qtbase/67b2eb8b302c19c9b3a80028e20141bde9aef01a
from 6.3 branch

Change-Id: If1be497af3907f31f1388e9db42150cf9ae60d66
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-02-23 13:46:23 +00:00
Maximilian Goldstein
05d34a7e1a tracing/MainView: Fix broken MouseArea signal handler
onCancelled tries to trigger the signal pressed() which is shadowed
by the property of the same name. Properly handled this by moving
the onPressed handler into its own function.

Change-Id: I8ed966e256acdd8dc76d9ee5b244682217323a0d
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-02-23 13:11:53 +00:00
Mahmoud Badri
ed21e25e14 CrashPad: Remove the 1 crash per hour limitation
Change-Id: Ie7634012f15059fd204cb03e37afd3d63d7bfb29
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-23 13:00:59 +00:00
Thomas Hartmann
a62aef2438 QmlDesigner: Set proper size if there is no project import
Change-Id: I29d8dbbac49c694439a600cfe393c6a475362714
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-23 12:39:49 +00:00
David Schulz
22dda4f8a5 ProjectExplorer: only use local files for size comparison
Change-Id: Ifbf218d4e459462ec6a115e69a5f3688642fddda
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-02-23 12:15:29 +00:00
Leena Miettinen
6e366c0823 Doc: Replace "New File or Project" with "New Project" or "New File"
We missed the .qdocinc files.
Update the screenshot.

Task-number: QTCREATORBUG-26610
Change-Id: Ic5a86c94e995a209c2139976ed645b7f71556b37
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-23 11:56:50 +00:00
Christian Kandeler
cf90264971 ClangCodeModel: Fix more false output arguments with clangd
For some reason, we never checked the actual matching AST node for
const-ness.

Change-Id: Icb58ba169d82e1ec02c9ff8d17f0170f0a78f99d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-23 10:54:32 +00:00
Christian Kandeler
7b82b55b73 ClangCodeModel: Don't highlight streaming operator args as outputs
... with clangd.
As with operator++ etc, it's immediately obvious to a developer which
arguments are modified.

Change-Id: Ia2b15d5eef7848b7ed284f8d544f039fe2927292
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-23 10:53:52 +00:00
Mahmoud Badri
08d1f30d4a QmlDesigner: Clear assets search when adding assets
Fixes: QDS-6195
Change-Id: I80c078d3b182bfa76980191bd875d76cb5683854
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-23 10:32:12 +00:00
hjk
4af9842a51 Docker: Remove local file access
I gave up on the idea, and even leaving the dead code in only
complicates the codebase.

Change-Id: If144c69adc8e9aa9b2c88050909e7a20b7218f18
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-23 10:29:02 +00:00
Christian Stenger
4d7c2ae54e Nanotrace: Fix compile on Linux
When using older compilers with Qt5.15.

Change-Id: Ib3d05efaa22b22af202fec8940f774af0029ca24
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
2022-02-23 10:10:29 +00:00
Mats Honkamaa
527074c7bd Doc: Update welcome screen documentation
Updated screen shots and examples instructions.

Task-number: QDS-6214
Change-Id: I0d35dd5efa034dc5e5d3ec7746a61a688ac88d5a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-02-23 10:07:05 +00:00
Christian Stenger
21f1c1a5e4 Update qlitehtml to latest master
Change-Id: I22fe7e28a0d2ba4848585ec62e1ac3ec904aaff9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-23 09:34:47 +00:00
Jarek Kobus
f1e0ca643e Protect the access to IDevice::sshParameters()
May be called in non-gui threads while it may be
changed from settings widget at the same time.

Change-Id: I2897fc2e54336b9043213411cb620896bbecde86
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2022-02-23 09:10:13 +00:00
Alessandro Portale
477ebd3b61 Android: Fix crash on exit
m_adbDeviceWatcherProcess can be 0 if Android is not set up.

Amends: c43ba1ae32

Change-Id: I90aef197c098f279a6bd3adb0485df74b8be1961
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
v7.0.0-beta2
2022-02-23 09:03:16 +00:00
Christian Stenger
3efec2b887 Tests: Add build files for qml-ast2dot
Change-Id: I5d439be4442ab5c41935534b93ebc9d6868cb880
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-23 08:44:36 +00:00
Alessandro Portale
cc139b768f Utils: Cleanup logging to qtc.utils.qtcprocess + elapsed time
Always write the process number on the same column of "started" and
"finished" line, for easier reading.
Do not quote the command line.
Write out only count of bytes for stderr (like for stdout).
Add extra logging categories qtc.utils.qtcprocess.stout and *.stderr for
verbose outpout.

Add the elapsed time in ms to the "finished" line.

Change-Id: I493279c1b4cdaf8f4c292df4777befc7f6c50753
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-02-23 08:35:45 +00:00
Eike Ziller
629ecc4f34 Mimetypes: Remove unused API and move one function to DocumentManager
Change-Id: I97b104a75c91ce6dc4a05146b3e10c1b674f3ff0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-23 08:32:33 +00:00
Leena Miettinen
b0a7fe31c0 Doc: Update Options > Environment > System screenshot
- Mention "Auto-save files after refactoring" in Opening Files.
- Include the screenshot in Specifying Environment Settings.

Task-number: QTCREATORBUG-26610
Change-Id: I05eaf85244ba1f1acf870bbcd37ba81f616b17a4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-23 07:48:58 +00:00
David Schulz
505358cb82 LanguageClient: support sorting outline combo box items
Fixes: QTCREATORBUG-26976
Change-Id: I6ec31072629c62a007bc27381f4adba597307057
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-23 06:54:33 +00:00
David Schulz
46a012bc11 LanguageClient: support sorting outline widget items
Change-Id: Idbe10ef1117aa2a62dd97aeff56da9978f9baa6b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-23 06:54:28 +00:00