Commit Graph

76686 Commits

Author SHA1 Message Date
Eike Ziller
b6f679d777 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/plugins/webassembly/webassemblytoolchain.cpp

Change-Id: Ia75c783e3ecab1f97de2b5c73a0979c49da82009
2022-03-18 16:07:51 +01:00
Christian Stenger
4e47ed66c9 Squish: Fix qml indentation test
Adapt to default build system change.

Change-Id: I70b5869871d4fbb612d4b6a28beb5e73c2d8d88e
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-18 14:39:56 +00:00
Christian Stenger
de1a328390 Squish: Fix debugging console app test
Change-Id: I752dab65948952081752a805018cfc3b01193855
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-18 14:39:49 +00:00
Christian Stenger
7012aa621c RemoteLinux: Allow open remote shell from Windows as well
Was originally restricted to UNIX hosts, but works for Windows
as well.

Change-Id: I233ec73760134256723a927de5e9e6cc9aefa8ac
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-03-18 14:39:30 +00:00
Robert Löhning
48c3a02229 Squish: Update suite_QMLS
Change-Id: I2cf804362b965be77ff0cd6686c998664e6eee02
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-18 12:57:08 +00:00
Robert Löhning
59c32bcfbe Squish: Don't use Qt4 in tst_HELP04 anymore
Change-Id: Idebff8b0bfd75daf573ab870dedd984eac9d09d0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-18 12:56:31 +00:00
Piotr Mućko
88342a6bba McuSupport: chop RTOS environment variable suffix
Change-Id: Iba35246af403a00bd0f750e3769e22a5010825eb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-18 11:35:46 +00:00
Christian Stenger
cc885348c7 Squish: Adapt to ui change
Change-Id: I0c896d5fa6d8fd814afec3206a2faae434da9dc7
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-18 11:31:54 +00:00
Miikka Heikkinen
10f2fb7be2 QmlDesigner: Don't scan for fonts if resource path is not valid
For some reason captureiconmode puppet is launched at QDS shutdown,
with empty resource path. This caused the entire drive to be searched
for fonts to register, making the puppet linger for up to a minute
after the shutdown.

Fixes: QDS-6482
Change-Id: I0f1fa4b6f5646c76d93f5820dae029033e1543a3
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-18 11:27:35 +00:00
Thomas Hartmann
1651efaee7 QmlDesigner: Hide puppet building unless showDebugSettings is enabled
Change-Id: I9c437bcbf4e4a255fd5ed81852f53d0a46dbcf1f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-03-18 10:36:30 +00:00
Thomas Hartmann
44f7bf09b5 QmlDesigner: Clear errors when starting the puppet
Change-Id: I25d163ae48d094d6e7ba5059f7832d1b48ffec65
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-03-18 10:35:28 +00:00
Thomas Hartmann
8867fd2a9b QmlDesigner: Quailfy library and directory imports
This unifies the behavior with the TextToModelMerger for consistency.
When parsing QML documents the types are already qualified in the same way.
The plan is to use NodeMetaInfo also in the TextToModelMerger in the future.

Change-Id: I046f39d87f1be0506740e3a4afdfbff9b13eca4b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-18 10:35:00 +00:00
Eike Ziller
b303afa4ec Fix black text in Search Results toolbar
In case the LicenseChecker plugin is enabled. That runs some event loop
during initialize() and it looks like that somehow leads to a wrong
palette for these two, at that time parent-less widgets.

Creating the widgets at a later time, just before they are added to the
toolbar, helps.

Fixes: QTCREATORBUG-27200
Change-Id: I00dc9c8981a0572d7b9f726ec870eb2afb188cc1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-18 10:26:30 +00:00
Robert Löhning
689d3d528e Squish: Update tst_CSUP01 and -02
Change-Id: I6e15545be1a92e43b5708dc5fdef456b8d2ab32d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-18 10:02:00 +00:00
Miikka Heikkinen
ce8c578b20 QmlDesigner: Center the add new state button plus sign
Fixes: QDS-6399
Change-Id: I8ed23363fbe8bc09fe8e6825dce096fcc664f6bb
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-18 09:59:34 +00:00
Jarek Kobus
47bcb63854 Add new types of blocking processes
Change-Id: I7668d0ac94a4e949f7ea67d8a1c0c144af5bd541
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-18 09:35:44 +00:00
Mats Honkamaa
9e3945e45f Doc: Update States view docs
- Updated images
- Converted jpg images to png
- Updated instructions

Task-number: QDS-6186
Change-Id: Ibaee1acd11881c49d272e9c41e11b729e3c951ec
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-03-18 09:33:45 +00:00
Jarek Kobus
7c39617324 Make the setup info visually more noticeable
By adding two leading newlines we separate it nicely
from the other part of the test log.

Amends 66c5b1e11e

Change-Id: Ic260cdc4cc2421ddb04bc5027082521800b268e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-18 08:55:42 +00:00
Piotr Mućko
8c04c2ea55 McuSupport: Introduce new implementation stub
New/legacy implementation will be chosen based on contents
of input json file.

Change-Id: I989fa667c43123f831cc77320684413cab7652df
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-18 08:38:43 +00:00
Jarek Kobus
481df466e2 Fix FileSystemAccessTest::testFileActions() flakiness
Always add " > /dev/null 2>&1" infix so that the
output of e.g. "rm" command, when failed, is redirected
to dev/null.

Enclose the input data in runInShell() with quotation
marks and escape all the characters in passed data
accordingly. Pass the "-e" option to echo in order to
turn on the escaping mode.

Add a new test for testCreateRemoteFile().

Change-Id: I7db07b57035242279cac7dd77a80ac6dd05bfb1f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-03-18 08:36:59 +00:00
Miikka Heikkinen
de8a67a412 QmlDesigner: Add drag support to empty asset library placeholder item
Fixes: QDS-6430
Change-Id: I561f4ed51ccb1e47472adb9baa6e5594eb93eafb
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-18 08:24:04 +00:00
hjk
a23c4ce014 Docker: Fix searching compilers in custom directories
Previously, detection (mostly) only used path.

Change-Id: If382205c2ff39cabfe21953e877e152dc952a84c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-18 08:21:51 +00:00
Miikka Heikkinen
c865481068 QmlDesigner: Add particle attractor visualization to 3D editor
Particle attractors are visualized similarly to particle emitters,
except that they are shown as blue instead of yellow when parent system
is active.

Fixes: QDS-6426
Change-Id: I085727dac7f3b4fa968e313b78db3f476941a7da
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-18 08:17:37 +00:00
Miikka Heikkinen
d6718fa838 QmlDesigner: Remove unnecessary import dialog for complex assets
Also remove target folder highlights for dragged complex assets.

Fixes: QDS-6433
Change-Id: I499da9444e9f153672fb38b66a6841fb6035cbbd
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-18 08:16:24 +00:00
Jarek Kobus
2d33425cd5 Revert "Android: Make the device watcher process terminate on shutdown"
This reverts commit e45e16d904.

Reason for revert: This one should look different in master

Change-Id: I4fbf3a9d046e5fe5a6a45d5ba93b685f5967498c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-18 08:13:25 +00:00
Eike Ziller
e914f42458 Merge remote-tracking branch 'origin/7.0'
Change-Id: I9c4ef46084fd392663c7c21c4ecdbc578ea28577
2022-03-18 08:42:02 +01:00
Robert Löhning
ab772c50be Squish: Update tst_cmake_speedcrunch
Change-Id: I46ab6f245a21546e6ebf20680f06b0cdd26eab8f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-17 21:35:44 +00:00
Assam Boudjelthia
5454dda249 Android: keep up with sdk tools changing folder structure
The cmdline-tools package used to have the folder structure "tools/bin".
However, latest packages are using the structure "cmdline-tools/bin".
And since subsequent updates we are installing "cmdline-tools;latest"
package, it will be put in "cmdline-tools/latest" folder, so we cannot
extract to that path, or otherwise sdkmanager will complain that the
path is in use.

Currently we extract it and put it under the SDK path, then use it to
install the essential packages, then it won't be used at all. This patch
changes that by extracting the downloaded package into a temporary
location, and use sdkmanager from there directly.

Also, this patch updates the links to the cmdline-tools along the way.

Fixes: QTCREATORBUG-27174
Change-Id: I1f5d0e38f5a026631e8a3852821d85a69d543c32
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-17 20:45:07 +00:00
Thomas Hartmann
e3babb235b QmlDesigner: Bump version number in wizard template
Change-Id: I2e9dc5863a4f8eacb5f9b258ea0744ad051242f9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-17 15:40:45 +00:00
Alessandro Portale
e45e16d904 Android: Make the device watcher process terminate on shutdown
Terminate on IPlugin::aboutToShutdown instead of
QCoreApplication::aboutToQuit. If needed synchronously.

Added "ADB device watcher started" logging.

Fixes: QTCREATORBUG-27118
Change-Id: I483659b018c74d179b64a5a4f17cc2c27c9598a8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-03-17 15:12:55 +00:00
hjk
188544052c Mimetypes: Make compile with namespaced Qt
Change-Id: I022b4cedee85b60a444241dc3b373aaa2fb924af
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-17 15:09:48 +00:00
Miikka Heikkinen
68d30df703 QmlDesigner: Add some basic on-drag property bindings for particles
Dragging Particle3D based items from component library will highlight
particle emitters for automatic property binding. Similarly,
dragging particle shapes will highlight emitters and attractors for
automatic binding.

Change-Id: I0e5a8d066beaa6d84e8665e7ae985287de32ceea
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-17 14:50:57 +00:00
David Schulz
519804a0d2 QmlJSEditor: prevent possible crash on font settings change
Fixes: QTCREATORBUG-27116
Change-Id: Iac38bd4ef20e739da4c4b8b1c072fd2cd648a66a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-17 13:55:10 +00:00
Eike Ziller
0648b7547a JSON wizards: Fix documentation of shared properties of all fields
"data" is only used for the widget type specific options.

Change-Id: Ie9b68cc22d84dff00e0a59f888cff0270b0f1e5f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-03-17 12:10:21 +00:00
David Schulz
2d3d66c115 Editor: limit painter path calculation for overlay selections
Only calculate a painter path if it is inside the paint event rect.

Task-number: QTCREATORBUG-26812
Change-Id: I9e7026b70251347fe8c38fc5b9278de943786956
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-17 11:03:00 +00:00
Assam Boudjelthia
03abdcda9f Android: don't fail if device abi list is empty
If for some reason the device abi list is empty, don't stop the
deployment, let it continue and potentially fail later.

Amends c1512dce87.

Task-number: QTCREATORBUG-27103
Change-Id: I484fbd1ddb365d5e96686eebc3ba76032684e506
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-17 09:21:10 +00:00
Jarek Kobus
b822a9462e Be more verbose when destroying process launcher
Process launcher: Reap all running processes in
LauncherSocketHandler destructor. Do it only once.
Warn about running processes.

From Creator side: Don't disconnect launcher's process
until it goes into the Creator's reaper.

Change-Id: I8af8e0247290cc07846fbf88b1521307293eed39
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-17 08:49:36 +00:00
Eike Ziller
be0c2600f8 DirectoryFilter: Fix missing file entries before first refresh
After re-starting Qt Creator, the filter was reading the file path cache
from the settings, but it didn't set the corresponding file iterator
that is used when actually invoking Locator.
That lead to the files only being available after the first (automatic)
refresh after a few minutes of Qt Creator running (depending on
settings).

Fixes: QTCREATORBUG-26381
Change-Id: I819961ad3b146d339e760f6648b8b01f437040f7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-03-17 08:47:15 +00:00
Eike Ziller
9fd2a059f6 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/plugins/android/androiddevice.cpp
	src/plugins/docker/dockerdevice.cpp

Change-Id: Id16ba0d9993c9f608242622aceae0a2a6691e05e
2022-03-17 08:48:28 +01:00
David Schulz
976653cd93 QmlProjectManager: fix crash
Fixes: QTCREATORBUG-27190
Change-Id: I188930f6e5cca5d32a91e9c6ce8ca6a798273bf2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-17 07:28:49 +00:00
Christian Stenger
a42b63ac05 Squish: Build speedcrunch with Qt5
Change-Id: I1fe79d6775b157fda26248917c9489edca88fd53
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-17 05:27:13 +00:00
David Faure
25d70414ab Improve item model templates
* Add missing "return true" in insert/remove Rows/Columns
* Use C++11 syntax for a vector of ints containing just "role"
* Make items not only editable, but also enabled+selectable, as expected
  by default

Change-Id: I8ed529d2534a495f2c924906fe51ada474f9347e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-16 21:33:04 +00:00
Alessandro Portale
c170e4fa57 Android: Use const & in a range-based for loop
Change-Id: Ib769d5133383ed30717e479107b6a74c53b72a58
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-16 18:33:25 +00:00
Christian Stenger
66c5b1e11e RemoteLinux: Avoid unexpected password dialog in tests
Make the test depend on environment variables and give some
hint how to run the test correctly.
Beside this make the test work on Windows and share the setup
with ssh unit test.

Change-Id: I6bbf1ec863449512646ca2c51d13fec537beedbc
Reviewed-by: hjk <hjk@qt.io>
2022-03-16 16:44:27 +00:00
Thomas Hartmann
e9074792d2 QmlDesigner: Add mutex
Creating models can trigger this initialization potentially from
multiple threads.

Task-number: QDS-6429
Change-Id: I1e9f715c150e37e6381c3f4e94fe6de1aaec7556
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-03-16 13:55:17 +00:00
Thomas Hartmann
51b51f8826 QmlDesigner: Fix crash
Fix raise condition when the global metainfo is initialized

Task-number: QDS-6429
Change-Id: I9cbeaecb440855f44b469dae5a3ef41c9ae7d8a8
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-16 13:55:11 +00:00
Thomas Hartmann
12923a433f QmlDesigner: Add App postfix to project name in cmakelists.txt
Change-Id: Idae3a257ce8b93b7f172fe4a64d548cde54ab7ef
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-16 13:54:55 +00:00
Thomas Hartmann
bed1d5dbf5 QmlDesigner: Fix cmake template for Android
Task-number: QDS-6420
Change-Id: Iac4286b20d763debef082b48e266da121c43ff4b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-16 13:41:16 +00:00
Tim Jenssen
9976f938e8 fix warning
qtcreator/src/libs/utils/tooltip/tips.cpp:91:31: warning: suggest braces around initialization of subobject [-Wmissing-braces]
    } qt_meta_stringdata =  { 8, sizeof("QTipLabel"), "QTipLabel" };
                              ^~~~~~~~~~~~~~~~~~~~~~
                              {                     }
1 warning generated.

Change-Id: Ic9672543a16be9cf02316efd379344a26567f5e0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-16 13:26:31 +00:00
David Schulz
36f18487d9 LSP: Fix workspace folder change capabilities
Change-Id: I096dd26744acbb0296b1731403c05903209770d8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-03-16 13:09:59 +00:00