Commit Graph

62421 Commits

Author SHA1 Message Date
Christian Stenger
de88d00ca4 ClangFormat: Fix build with Qt5
Amends 4022ed547d.

Change-Id: I66fc822443c8353209446cf7973a3db9dc52debe
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-03-28 09:00:23 +00:00
Jarek Kobus
b7153131ff QbsSession: Get rid of no-op calls to QtcProcess::terminate()
Calling QtcProcess::terminate() is a task for implicit ProcessReaper.
Delete the process instead.

Change-Id: Iaa0e735a136ec0f5a21724f620eb2c542dedf48f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-03-28 08:58:34 +00:00
Andre Hartmann
e3bb18f8e1 Gerrit: Skip non-Gerrit remotes in Push to Gerrit dialog
In my case, I have a second remote gitlab which was
always selected instead the expected remote gerrit.

Change-Id: I7860ea4743dbfa5d1fd4375821474950549e0600
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-03-28 08:08:11 +00:00
Jarek Kobus
65f5fde2e6 AndroidAvdManager: Get rid of no-op call to QtcProcess::terminate()
Calling QtcProcess::terminate() is a task for implicit ProcessReaper.
Delete the process instead.

Change-Id: I92fe34a18e15ca95f6bab2b7932faeee8b92621d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-28 07:46:00 +00:00
Thomas Hartmann
dc6dbbf082 QmlDesigner: Add support for object properties
property QtObject: myObject: QtObject {}

Change-Id: I1f1428bdb383c31fd2976bd7ac69087da54d1044
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-03-25 21:44:16 +00:00
Thomas Hartmann
6271b7ad85 QmlDesigner: Fix TransitionEditor for cpp types
Task-number: QDS-6537
Change-Id: I800dbba7e5ac67908ae9ff7b1717910472cf4c81
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-25 17:07:55 +00:00
Jarek Kobus
dcc61b854a IDevice: Add rootPath() method
May be useful for constructing other remote paths.

Change-Id: I83b647f657565bf99e507a1821cf1c3c49a100bb
Reviewed-by: hjk <hjk@qt.io>
2022-03-25 15:02:31 +00:00
Artem Sokolovskii
4022ed547d [ClangFormat] Remove redundant checkboxes
- Removed redundant checkboxes
- Removed apply button
- Combined checkboxes to combobox

ToDo:
- Specify behavior for global and project settings

Change-Id: I39a00ac8439ae7be3041890f7fc882849685d102
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-25 14:17:48 +00:00
Christian Kandeler
b97c9494af ClangFormat: Adapt to LLVM 15 API change
Task-number: QTCREATORBUG-27170
Change-Id: I3676792da351f52199b1bf303c596e581469d7a5
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-25 13:36:50 +00:00
Christian Kandeler
a3e0b139de TextEditor: Make sure cursor is visible after refactoring
Fixes: QTCREATORBUG-27210
Change-Id: I612f6e91188730d6abdfef3f2fe8a286fcec4831
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-25 13:31:36 +00:00
Jarek Kobus
ed94e0c066 Archive: Avoid calling blocking stopProcess
Make Archive constructor public.
Make the caller responsible for deleting the Archive object.

Don't automatially run the unarchive process when constructing
Archive object. Provide a start() method, to be called after
the caller has connected to Archive signals.

Add Archive::isValid() method.

Remove Archive::unarchive() gui overload, as it's unused.

Make sure we don't leak the Archive object in
AndroidSdkDownloader.

Change-Id: Idf67262554cdfef50aef4a2234b6a5089110f9a2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-25 12:49:19 +00:00
Jarek Kobus
41f9962ea6 AndroidDeployQtStep: Don't handle unfinished lines separately
Automatic handling of unfinished lines should be fixed
in cfe8b7ad88

Change-Id: I9f4bcf876ce5d7d51b651b6e997b7891d4483c56
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-25 11:15:54 +00:00
Assam Boudjelthia
5f16074cb3 Android: rephrase sdk download popup question
Remove the double column, put the path in new line to avoid potential
word wrap at the start, and surround it with quotes.

Change-Id: Ifb33e4efaaa13342bfc3a75fc58d67e359e4e804
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-25 09:23:52 +00:00
Assam Boudjelthia
b6c83df7d9 Android: move SDK Manager to separate dialog
Hide the SDK Manager into own dialog which reduces the visible
elements on the Android Settings page by default. The dialog
will be brought up when installing essential packages for example.

Also, the dialog can be opened manually via a new button, which
makes it available on demand instead be there in the front all
the time, because that SDK Manager UI is needed only when installing
packages which doesn't happen often.

Change-Id: I09b92ae7b10673ba520da9ffd98d8120e1aaf104
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-03-25 09:23:37 +00:00
Assam Boudjelthia
20c0d93f7d Android: add option to connect physical device over wifi
Android's ADB allows connections over wifi, firstly, a port needs
to be opened from the device, then adb commands can be used to
connect the host to the device over an ip and port. Afer that,
a device can be disconnected from USB and the wifi connection
could be used to do all jobs that were done over USB.

The setup operation require the device to be connected via USB.
This can replace the manual process of dealing with ADB commands
to prepare the connection.

The "Setup Wifi" action is only added to Hardware USB devices,
and not AVDs nor physical devices that are already connected over
WiFi.

Change-Id: I37897a528b45cdeee2764071ec45ec1b3316cdbb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-25 09:23:12 +00:00
David Schulz
b165e5f0ad Utils: add tooltip parameter for info bar controls
Change-Id: I395dea4240d09b3721a24e04016c6db4076449b5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-25 08:26:48 +00:00
Jarek Kobus
5924716e21 AndroidSettingsWidget: Fix some issues
1. Don't create gitCloner if we are not going to start it,
   i.e. when we early return with QMessageBox::information().
2. Pass a context object of *this into gitCloner connection.
3. Don't kill the gitCloner, deleteLater() instead.

Change-Id: Ibb68627ed8d16e2dc43c9d63761609c8b8c82db0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-25 07:05:05 +00:00
Christian Stenger
d7bcd19db6 StudioWelcome: Fix missing include
Amends 618eda3572.

Change-Id: I1f6bc42152154ccfd256cd2e2f475c0e6ba534dc
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-24 12:20:41 +00:00
Christian Stenger
2c08f14ee0 SdkTool: Fix qbs build
Amends e3aad67ce5.

Change-Id: Ic62dd47fbaa70092f39bdfd5d2dd6870a4aaec00
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-03-24 12:19:24 +00:00
Thomas Hartmann
3b5c56bcfa QmlDesigner: Add invalid ids to QmlJSCheck
Also improving document message for exceptions.

Change-Id: I7878987ce73f5d4891ced3c702c7804b25b07eb3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-24 11:41:53 +00:00
Miikka Heikkinen
d3dae6b7dd QmlDesigner: Don't generate new id for node if already set
Source template may already set the id for the generated node,
in which case we don't want to override it.

Fixes: QDS-6530
Change-Id: I22b86e6bb744372ad07924f440a6ecd0dad54095
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-24 10:58:11 +00:00
Orgad Shaneh
38462c8f13 Debugger: Fix MSVC warning
signed/unsigned comparison.

Change-Id: I5fab0ccadbeb8c034410169bb6a3b4439e3f7516
Reviewed-by: hjk <hjk@qt.io>
2022-03-24 10:45:55 +00:00
Samuel Ghinet
3935c671dd QDS New Project Dialog fix: recents should include all project properties
Previously, only the wizard category, name, and size were saved for
recent presets. Solved the problem by using the same kind of store (and
struct type) for Recent presets as for User/Custom presets - this way
we can save all properties.

Other changes introduced:
* After user creates custom preset C, then creates a project from it
(resulting in the creation of a Recent preset R), if the user then
deletes custom preset C, then the recent preset R will remain -
previously, all recents of the custom preset were deleted
* Now we can have multiple recent presets with the same name and size -
so, no distinguishing feature inside the Presets view. User will have
to look at Details and Styles panes to view differences.
* Replaced .ini format with *.json file format.

Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-24 10:31:16 +00:00
Jarek Kobus
bd7949f852 AndroidDeployQtStep: Make m_process local
There is no need to keep m_process as a class member,
since it's only used in just one function.

Change-Id: I156b978a18ab25a41b0e52d00fcb90c0f7f12ddd
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-24 09:43:57 +00:00
Jarek Kobus
1b5c4504af Get rid of no-op calls to QtcProcess::kill()
Leave the work for implicit ProcessReaper.

Change-Id: Ie01c4e996fda18b7cee77851394174556c6f3857
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-24 08:53:59 +00:00
Jarek Kobus
4ced33f4fe CallgrindController: Get rid of no-op code
Amends 5830641d0f

Change-Id: I7474cf27de4c779ebe36bf01856b7ce0634dd999
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-24 08:14:38 +00:00
Jarek Kobus
d7ff76be69 QtcProcess: Drop return value from stopProcess()
It wasn't used at all.

Change-Id: Ife0989c73c67b6106e61c40931f318ee7a5b062d
Reviewed-by: hjk <hjk@qt.io>
2022-03-24 08:12:03 +00:00
hjk
e3aad67ce5 sdktool: Clean up AddAbiFlavor test
Suppress expected output.
Split complex 'if' for easier debugging.

Task-number: QTCREATORBUG-27227
Change-Id: I9bc305d3aacd79f6097e92f54951aec2a45d28a3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-24 08:09:18 +00:00
Miikka Heikkinen
9a9cd6d62f QmlDesigner: Prevent showing preview tooltip when button is pressed
On some platforms, drag will stop deliving mouse events to MouseArea.
Disallowed showing the tooltip when a mouse button is pressed.

Fixes: QDS-6481
Change-Id: I8777d57be1bfef8470571027d9257d3a10eb5a7a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
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-03-24 05:59:34 +00:00
Miikka Heikkinen
e40041978e QmlDesigner: Fix font preview tooltip image
The preview tooltip was recently reduced in size, but font previews
were still being rendered the old size and scaled down, degrading
image quality. The new default size is bit too small to render the
sample text of fonts nicely, so added an option to set unscaled image
to the tooltip, allowing us to use twice as wide preview images for
fonts.

Fixes: QDS-6486
Change-Id: Ieaabfbea11e47509de7cd6aed93464d8595ea541
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-03-24 05:59:08 +00:00
Miikka Heikkinen
bd607909a5 QmlDesigner: Reset puppet when ParticleShape3D is reparented
This is a workaround to QtQuick3D bug that only updates the parent
node of the shape at componentComplete.

Fixes: QDS-6473
Change-Id: Ice8afdc81b35eb40c07889bb1eebcdb70e68c17d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-03-24 05:58:46 +00:00
Thomas Hartmann
a889dea4d7 QmlProjectRunConfiguration: Do not enable DebugTranslation by default
Do not enable this service by default since it breaks the profiler and
debugger and it is not required.
This does not break language switching.

Task-number: QDS-6523
Change-Id: Ib55179674c59034cdf1ece135a3f9a2e8cf08e86
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-23 17:10:20 +00:00
Jarek Kobus
6d853023c6 QtcProcess: Fix a comment
Amends 8e0ae8ba96

Change-Id: Ie5b99525ec7de0565cd79ed52c7fc094d5509ddc
Reviewed-by: hjk <hjk@qt.io>
2022-03-23 16:00:46 +00:00
David Schulz
62eb36e7ec Python: Use relative file path as run config name
Change-Id: Ifac28b9e4b066ea62b43a7da04b71e2c4317a898
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-23 13:56:56 +00:00
David Schulz
d70150818f Utils: postpone combo box handling of the info bar
We might want to remove the info bar in the callback. This makes sure
that all direct connections are handled before removing the info bar
and the combo box gets deleted.

Change-Id: Icfce358d69923fa0558d48c2513e1cfff4926ed9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-23 13:28:52 +00:00
David Schulz
be0b962ce8 Utils: add current index parameter to InfoBarEntry::setComboInfo
Change-Id: I8933d0583846672a6bebdefec402203375e5e09b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-23 13:24:27 +00:00
Eike Ziller
ae6c974fb2 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/plugins/android/androiddevice.h
	src/plugins/android/androidplugin.cpp
	src/plugins/android/androidplugin.h

Change-Id: I1a68354415283fe4a7450706520a576d2a1775e0
2022-03-23 14:16:07 +01:00
Thomas Hartmann
39a81a7baa QmlDesigner: Force QtQuick.Studio.x components to use version 1.0
With the latest chages and switching to cmake the version
is actually 6.x, but 1.0 is also supported and this will
keep projects backwards compatible.

Change-Id: Id3d77b323f008ca20bd276859d5a4a573663120c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-23 11:54:56 +00:00
Jarek Kobus
816746a06d LauncherInterface: Wait for graceful finish of process launcher
Give process launcher a chance to finish its processes
gracefully before we finish process launcher's process in Creator.
Otherwise, when Creator's process reaper kills the process
launcher's process while the process launcher is still
reaping its processes, the process launcher may leave zombies.

Instantiate the ProcessReaper inside ProcessReaper::reap(),
otherwise its destructor won't run at all inside process launcher.

Reverts e45e16d904

Fixes: QTCREATORBUG-27118
Change-Id: I00290cda05538b5a7ecbeb08240d1e3772d43d62
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-23 09:33:20 +00:00
Christian Stenger
71a7928194 Python: Fix typo
Change-Id: Ide2d1d893ffcb0ebb6cb3aa787cf1f07960fcfc0
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-03-23 09:28:50 +00:00
David Schulz
7c3d6c1fc1 Python: remove unused variable
Change-Id: I1c16e4b3795f83e1107d39f0265465b0926d4c97
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-23 09:28:12 +00:00
Tim Jenssen
faadc86ece qml2puppet: disable multilanguage if Qt version < 6.2.1
Change-Id: I8dc7114ac550e8cc0d5a1f0e5f5524145aa158a3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-23 09:19:39 +00:00
Thomas Hartmann
bf2ece2d15 QmlDesigner: Remove globalBaseUrl
It is not used anymore.

Change-Id: I1d436888b5a93a187065cd8276b55a233a0f374c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-23 08:50:30 +00:00
Thomas Hartmann
6662e138d7 QmlDesigner: Remove finishedNotify
It is not used anymore.

Change-Id: I706a973c55c22211457bac01534a5e7b59a40b25
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-23 08:50:24 +00:00
Thomas Hartmann
4ed637d8da QmlDesigner: Do not allow baseState as id
Using this as id will lead to bugs.

Change-Id: I76997a31e290e0cd67688fecdb1e9521c88481da
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-03-23 08:50:16 +00:00
Thomas Hartmann
fe711ebce4 QmlDesigner: Parse .metainfo files from the share folder
We have some plugins that essentially only contain a .metainfo file.
the possibility to drop .metainfo files into that folder simplifies things.
In QDS 3.2 this will be used for the particle library.

Change-Id: I0c4bb7f66bb8eaa3f806ec9d34c6991d08ef5a5f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-22 14:39:27 +00:00
Eike Ziller
de63ea9a60 File System: Allow removing empty folders
As the reverse operation of New Folder.

Fixes: QTCREATORBUG-26886
Change-Id: I9c65a152850ec8260e9c260ea49cdad048a92aa2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-03-22 11:54:28 +00:00
Eike Ziller
22c67db406 Fix double-clicking in Projects view to open file in extra window
When you have an external editor window open (Window > Open in New
Window):

- make sure that the editor has focus in the main window
- switch to the external window
- double-click a file in Projects, Open Documents, or File System view

The file is supposed to open in the external window.
The problem is that clicking into e.g. Projects view activates the main
window, which changes focus, and the current editor.
Something changed in the event order in Qt (also Qt 5), so the existing
workaround that delayed setting the current editor view in that case by
just one event loop cycle doesn't work anymore. Delay be the double-
click interval instead, so the double-click can be processed before the
main window's editor view is made current.

Fixes: QTCREATORBUG-26773
Change-Id: I56efd5a50a8bb986563c8c15d340756dace06494
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-22 11:52:10 +00:00
Thomas Hartmann
70c44acdd8 QmlDesigner: Fix itemlibrary template generation
Since this is likely executed in a transaction and
newQmlObjectNode.setId() uses refactoring on the QML code
this is not working as expected. Setting the id without any refactoring,
that triggers changes of the QML code, is save to be used.

Change-Id: I5d29689eff34827de9e451f433d9a4b42569a64e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-22 11:50:23 +00:00
Assam Boudjelthia
2846bef563 Android: fix logcat retrieval on pre Android Nougat
Logcat on pre Android Nougat (API <= 23) was broken because the the
returned output from the adb command had lots of null characters \u0000
in the string, and thus the comparison against the deployed package
name was failing and the pid was always -1. This makes sure to remove
any null characters before the comparison and simplifies the code a bit.

Task-number: QTBUG-101673
Fixes: QTCREATORBUG-26732
Change-Id: I3f185eceab376dbb0f4f11cf628b71e058ee5583
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-22 11:42:11 +00:00