Commit Graph

74059 Commits

Author SHA1 Message Date
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
Christian Stenger
f43348c4f2 Squish: More corrections due to change of default build system
Change-Id: Ia221e1e84784f5218d14258fcc24dcac900d60ad
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-16 12:56:43 +00:00
hjk
42d7a96a67 Docker: Add some example for boot2qt kit setup
Change-Id: Ib4dfc474eee19d7e0f66bf5a76cd6c808df15efc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-03-16 12:51:42 +00:00
Mats Honkamaa
7607f6dc06 Doc: Update presets documentation
- Add info about custom presets
- Some cleaning up, naming, etc

Task-number: QDS-6369
Change-Id: I4c8cd1109111231948c26b04f7706d122e94a9b2
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-03-16 12:17:12 +00:00
hjk
68faedd62f Utils: Add a PathListEditor::setPlaceholderText
Change-Id: I517dfec9d57b6965a3e40c786aa238f04fc69546
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-16 11:40:00 +00:00
David Schulz
d776445953 Editor: prevent repainting complete editor with for current line
Instead make sure that the widget is updated after the current line
changes.

Task-number: QTCREATORBUG-26812
Change-Id: I9fc754255891ec29d3499da0ee23aa56b1f285aa
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-16 10:37:17 +00:00
hjk
cc51e32b2d Docker: Add a warning when the mount path list is empty
The common use case shares project sources between host and docker
container, in that case, not sharing anything will not be useful.

Change-Id: I44b12089579ead008023caf5134c613fc145b8c7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-16 08:53:39 +00:00
David Schulz
b5457750f2 Editor: do not request updates for the complete annotation area
... inside the paint event. We should always make sure to call an
explicit update when we add, remove or change annotations via text
marks.

Task-number: QTCREATORBUG-26812
Change-Id: I5afbdad5e1916e99665b5cb1b1cd2a0bbf7335c3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-16 08:41:54 +00:00
Eike Ziller
5cf4510da5 Fix context menu of snippet editor
The snippet editor is a TextEditorWidget, but the special context menu
of that doesn't make sense in the context of the snippet settings.
Get the default context menu back.

Fixes: QTCREATORBUG-27176
Change-Id: I9681482f83fe32d15be0b1386e2fb26870b955e2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-03-16 07:46:11 +00:00
Christian Stenger
d24f13d66d Squish: Adapt to changes ui text
Change-Id: I03187ddecb7a5737a87a626135584458795aa633
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-16 05:18:18 +00:00
Christian Stenger
2907d60973 Squish: Handle build systems more appropriately
Change-Id: I43e89d76c4199a741a5606dd0d6de2165b8133c6
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-16 05:18:10 +00:00
Eike Ziller
e7772949d2 Update changelog for 7.0.0
Change-Id: I51a2cbe1530fbcea4adbb0a429bac3021397d704
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-03-15 15:21:02 +00:00
Miikka Heikkinen
6c9ded9461 QmlDesigner: Block starting drag when clicking on non-draggable node
Fixes: QDS-6415
Change-Id: I328e7715d2837d1126506a6fbbf4d1bf52cc250f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-15 14:53:33 +00:00
Robert Löhning
59a721c0ea QmlDesigner: Compile fix for Qt 5.15
error: passing ‘const QQmlContext’ as ‘this’ argument discards qualifiers

Change-Id: I4fa9ed0098f5bd63925534459d1171d7c9430897
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-15 12:36:52 +00:00
Samuel Ghinet
ec55793a22 New Project Dialog: Use hover states for interactive items
Also, changed the "Save Preset" dialog so that, when the user presses
Enter, the dialog will be accept-ed.

Task-number: QDS-5741
Change-Id: I7056d1184a3d9d400ac718c8d434cf2ad36ed35e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-15 12:06:07 +00:00
Tim Jenssen
f487143848 qds: extra code to handle license in about dialog
Change-Id: If9b493a4c9582b1fefac3dcaf31d34ef08eb6e6d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-15 10:54:45 +00:00
Miikka Heikkinen
72e4287ac3 QmlDesigner: Fix navigator preview of Models
Now we resolve absolute source url for our preview model, so it
will always find the custom mesh files.

Also always use the Node type preview if the instance is a component,
even if the root node is Model. This ensures the preview works properly
in case there are child nodes inside the component.

Fixes: QDS-6204
Change-Id: I48ef273e5a5dca13abe25816b5edf0be7dd217ff
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-15 10:45:24 +00:00
Assam Boudjelthia
a141d56991 Android: Don't call getDeviceState() on empty serial number
Avoid calling getDeviceState() if the serial is empty, which
won't give any useful info for emulators. This will avoid
multiple state checks at QC start as well.

Also, set the default new AndroidDevice state as Disconnected,
which reflects better the state of an empty newsly constructed
device which we don't know the state of.

Change-Id: I854e95e28b150f09c3eff6b8a75b2df6bd4aa1ce
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-15 09:03:49 +00:00
Robert Löhning
82534fc979 Squish: Explicitly use qmake-based projects in suite_APTW
Creator's default build system is CMake now which broke the tests.

Change-Id: I901b44dd4545a297d0100da5d92aa1bea79e41d3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-15 08:24:20 +00:00
Christian Stenger
cd7a0bbef5 Docker: Inform user early if adding device fails
When retrieving the list of images there is no indicator when
something failed, so add one.

Change-Id: I2e0cde4ba33527e1b2abeecb5b3a06507dabf472
Reviewed-by: hjk <hjk@qt.io>
2022-03-15 05:43:02 +00:00
David Schulz
525d26db03 Editor: centralize annotation filtering
Change-Id: I68464b14b44beee772ace93f7bdebc32ae3325ef
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-15 05:22:22 +00:00
David Schulz
32fc9653ed Editor: only update annoations inside event rect
Change-Id: I61c2648734c3d5b3018215a83e7d4226905a6993
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-15 05:22:16 +00:00
David Schulz
febe659690 Editor: filter text marks in paintAnnotation
Calculate the correct width for the annotation and decide inside
TextMark whether it can be painted or not. This will also
make sure that all annotation rectangles are correctly saved in
TextEditorWidgetPrivate::updateLineAnnotation.

Change-Id: I7e6c606e615b1673a34000618e106efb14184b10
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-15 05:22:08 +00:00
David Schulz
a8cad01887 Editor: make sure to update marker on annotation change
Ensures an update for the markers editor widget after any of the
information displayed in the annotation has changed

Change-Id: I845e05f5103ee1615cfc3d7760cdfc2bbf510f32
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-15 05:22:01 +00:00
Assam Boudjelthia
851171f772 Android: rename avdname to avdName in AndroidDeviceInfo
Change-Id: I9f4743b0d9f953f1fa407acfea41345571cb9998
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-14 17:48:31 +00:00
Assam Boudjelthia
e5ce9e9e76 Android: Get rid of the avd info fields in AndroidDeviceInfo
The AVD specific fields don't need to be carried out by QtC settings,
these can be read from the AVD's config file when they are needed.

This also is good because those values can change at any time,
either manually or by some other IDE like Android Studio, and thus
we don't really need to manage them ourselves.

The fields in question are: skin name, target name, sdcard size,
openGL status.

Change-Id: I86163500ec2fed035e32ec02ed17e182778db4a7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-14 17:47:55 +00:00
Eike Ziller
3f0c8b2149 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I1ce9876150239751a1187bc0c4b8fc5fef1ab40d
2022-03-14 14:02:14 +01:00
Mats Honkamaa
4594250b6c Doc: Update text editor view docs
- Add info about search function
- Update screenshot

Task-number: QDS-6371
Change-Id: I162ad6917823b8834de94513ed77edc8ee0c0344
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-14 12:20:03 +00:00