Commit Graph

2395 Commits

Author SHA1 Message Date
Jarek Kobus
97461f6f18 AndroidRunnerWorker: Replace jdb process with Utils::Process
Change-Id: I269c9910a6d0ca1f259a3632abe3601bcdb19f8e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-08-09 12:41:16 +00:00
Jarek Kobus
81d38bb711 AndroidRunnerWorker: Replace adbLogcat process with Utils::Process
Change-Id: Ia4e0e7e0b49ca1847bac537a7672c39b069bf767
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-08-09 11:46:30 +00:00
Jarek Kobus
f313c5538f Android: Simplify return statements
Change-Id: I100b16a1fd74c4528f61f681bbeb5cdb4adddee5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-04 09:52:39 +00:00
Jarek Kobus
8dd46d0399 Various Plugins: Simplify return FilePath statements
Change-Id: Ia9efb86f722caca1492b577d51442f1f23b804b4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-08-02 08:19:23 +00:00
Jarek Kobus
82712e12f8 Various Plugins: Simplify return QStringList statements
Amends 925bb2ca31

Change-Id: I57bee33cb7acd0ab1cdcfb6897a4847b912b4c97
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-08-02 08:18:56 +00:00
hjk
68c3103f76 Android: Use a more direct access to the tools' path
Change-Id: I49c574144fd4d6b2edd829538c424465c1fe7f05
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-27 13:03:41 +00:00
Jarek Kobus
77cee300f6 BuildStep: Some cleanup
Remove unused BuildStep API.
Remove outdated docs.
Cleanup includes.

Don't repeat custom cancel messages from build/deploy steps,
as in case of cancel action the follow-up message:
"Canceled build/deployment." always appears anyway.

Change-Id: I50b31e0cc688ee66d76a3a1dbe58eb72702112ad
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-27 12:06:17 +00:00
Eike Ziller
a419670ff5 Build: Change plugin json.in files to CMake style
They were still using variables in qmake style.
Directly use CMake variables in the json.in files and remove the no
longer needed escaping of quotes.

Adds a fatal message if it detects the old style in a .json.in file for
easier porting.

Change-Id: I8de88d8db2da55781f0e9d72eda03f943723188e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-25 13:21:16 +00:00
hjk
c558896594 ProjectExplorer: Replace the fromMap error return value for toolchains
... by some out-of-band mechanism, keeping previous functionality.

The driving reason is to get the same fromMap signature as in the
AspectContainer base.

Change-Id: Ife7fbf4d0e0f78d88729021eb5220ec4a8ddb2ec
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-24 10:17:36 +00:00
hjk
1c4f973365 ProjectExplorer: Replace the fromMap error return value
... by some out-of-band mechanism, keeping previous functionality.

The driving reason is to get the same fromMap signature as in the
AspectContainer base, however, the whole mechanism seems rather useless:
There are only a few places that actually ever could report errors,
in those places "moving on" looks ok, too, and these few places
are not conceptually different than a lot others.

Removal of this (new) mechanism is left for later.

Change-Id: Ibe7a0456bc3b84a84e942231f14446e783372d76
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-24 06:31:51 +00:00
hjk
53d06feecd ProjectExplorer: Change ProjectConfiguration::toMap signature
To match better with the rest, especially the base AspectContainer.

Change-Id: Ide0966cab3219800aa6b7b9e6012731a3fbe7a6f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-21 16:12:15 +00:00
hjk
7dfdb6d36c Android: Hide some manifesteditorwidget code in the .cpp
Change-Id: I4478cb2d85535c8d92aeef5e1e664e001d168ec5
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 09:09:38 +00:00
hjk
944a1e8a11 Android: Remove a few unnecessay Q_OBJECT
Change-Id: Ic57a7cfc58d741547cb793b24ff1358d900eaf5d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-20 09:09:29 +00:00
Jarek Kobus
6bb8bbabd2 Utils: Rename archive.{cpp, h} -> unarchiver.{cpp, h}
Change-Id: I0c3fdb68a15a6ad7419405d2bef86d4e75537df5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-07-20 07:14:43 +00:00
Jarek Kobus
134eee611a AndroidDeployQtStep: Use promise for checking canceled state
Change-Id: I4fec6004b0b17be182088dab4deb49aa2d7c8a0b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-07-17 13:57:30 +00:00
Jarek Kobus
64d16786af AndroidDeployQtStep: Employ task tree for running
Task-number: QTCREATORBUG-29168
Change-Id: Icb38b0036025cc4fe7ab7a6c8086f51922630730
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-07-14 07:38:30 +00:00
Jarek Kobus
47ac604aea AbstractProcessStep: Use task tree for all subclasses
Introduce AbstractProcessStep::runRecipe() virtual method
with the default implementation.

Task-number: QTCREATORBUG-29168
Change-Id: Iac75f4c38f8ee91ad8ac9324bb27881a3722911f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-07-14 06:48:58 +00:00
Jarek Kobus
bc2c2bbae9 AndroidPackageInstallationStep: Employ task tree for running
Task-number: QTCREATORBUG-29168
Change-Id: I18d1188a18559bb8030a2c966ea3764833ad96f8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-07-13 15:19:46 +00:00
Jarek Kobus
f507eec207 AndroidBuildApkStep: Employ task tree for running
Task-number: QTCREATORBUG-29168
Change-Id: I40fb62ae33e436ba79cad852bf4661f72fb45bda
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-07-13 15:18:56 +00:00
hjk
54a6145ae9 Android: Use aspects more directly in AndroidRunConfiguration
Change-Id: I0eed35acd6c65dccd99ace12dc98bf0e3ab1a2f0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-13 11:19:44 +00:00
Jarek Kobus
b37b94f0e5 AbstractProcessStep: De-virtualize finish() method
Provide a setDoneHook() setter instead. The hook is
introduced temporarily, as when all the subclasses
are transformed to use the task tree, the done hook
is going to be a part of the subclass' recipe.

Task-number: QTCREATORBUG-29168
Change-Id: Idbc0f8b8a32c8df2fa5ecb73ed1cbaedad99620d
Reviewed-by: hjk <hjk@qt.io>
2023-07-13 06:50:07 +00:00
Alessandro Portale
918978ce89 Android: Remove unused androiderrormessage.h/.cpp
These have been added 10 Years ago with the plan to use them soon after,
but that did not happen.

Amends: db78293e7f

Change-Id: Ic916eafba56cbb5e4d1dadfb63222fa2870fbd2c
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-07-11 19:15:12 +00:00
hjk
739f835ef1 ProjectExplorer: Remove unusual {Arguments,WorkingDir}Aspect
Follows suite to 2cc4967 to have the user side code more uniform.
Most of the extra verbosity (setMacroExpander) can go away again
when distributing the expander via the "owning" AspectContainer.

Change-Id: I9e80cb235f0a4a9ebee601dd638aefbaa41efc1b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-05 12:55:31 +00:00
Jarek Kobus
d222cc2dbd AndroidRunSupport: Remove unneeded overloads
Change-Id: Id6a8a5a387acb4f33752ad61ab27893a138bac9b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-07-03 13:30:38 +00:00
Eike Ziller
26e96bfad8 Merge remote-tracking branch 'origin/11.0'
Conflicts:
	src/plugins/debugger/debuggeritemmanager.cpp

Change-Id: I9d99d13feff9315f52eacbd84857c63cb69bf804
2023-07-03 10:24:09 +02:00
Jarek Kobus
297ff3b9b1 AndroidRunnerWorker: Remove no-op code
Since there is no call to recordData()
with ANDROID_PRESTARTSHELLCMDLIST or
with ANDROID_POSTFINISHSHELLCMDLIST, the recordedData()
will always return empty variant.

Change-Id: I2d96ddee12181c614a0282f5103fba3fc06b6486
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-07-01 21:23:17 +00:00
Alexey Edelev
1e81f206b0 Android: Pull android debugging related files to a subdirectory
When building the project in QtCreator using the Debug configuration,
android deployment procedure pulls app_process from the device to
establish the debug environment. This operation litters the project
build directory with the libraries and executables that don't belong
to it. Instead of pulling the files to the root build directory, it's
better to isolate these files using subdirectory.

Fixes: QTCREATORBUG-29336
Fixes: QTBUG-113851
Fixes: QTBUG-111284
Change-Id: I32c3403dc5f79c42b1ff2bd676c2cf3ae8d43ec3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-06-29 11:41:02 +00:00
Eike Ziller
606be1f69f Merge remote-tracking branch 'origin/11.0' into work
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: Ib4653a1ce75c7cce658f4bb843481de014d0fcf7
2023-06-26 12:12:58 +02:00
Alessandro Portale
42a62a3a5d Android: Obtain values for AndroidRunnerWorker from settings data
The members of AndroidRunnerWorker are supposed to be initialized with
aspect values from the AndroidRunConfiguration. But they were instead
unsuccessfully obtained from the RunControl's aspects.

This obtains the values from the RunControl's settings, instead.

Fixes: QTCREATORBUG-29160
Change-Id: I124184c32d158e0648a0ee1d23dfe8707d18eab8
Reviewed-by: hjk <hjk@qt.io>
2023-06-26 07:34:57 +00:00
Eike Ziller
dff9e1463b Reduce usage of app_version header
Most information is available via Q(Core|Gui)Application.
Add an AppInfo structure for the things that are not.

This avoids that the information ends up duplicated and
hardcoded in the plugins, which is not needed or desired.

Change-Id: I4d565e75c42a7b8facafa90c27096ea49359215d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-26 06:57:46 +00:00
Eike Ziller
6479785c20 Merge remote-tracking branch 'origin/11.0'
Change-Id: Icb3ed8a1aaf31e8201a61d04221bfcb23a78562a
2023-06-22 13:09:00 +02:00
Leena Miettinen
500fb94011 Android: Add full stops to end of messages
Change-Id: I19df9219408030bbfe3f414d7d89f2c1abddbc06
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-21 08:50:59 +00:00
Eike Ziller
6c601b8cd4 Merge remote-tracking branch 'origin/11.0'
Change-Id: I8d1c9720a868da02b3157a48954eb4e262539c84
2023-06-15 09:48:58 +02:00
David Schulz
95609551a1 Core: add aboutToSave and saved signal to IDocument
We need reliable signals that gets emitted when documents are saved to
inform the language server about the document state change.

Change-Id: I0a1e8a5317ae6984ff17d878952c74f69765e3f9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-15 07:19:39 +00:00
Eike Ziller
e7870f736d Merge remote-tracking branch 'origin/11.0'
Conflicts:
	src/plugins/clangformat/clangformatutils.cpp

Change-Id: Ide285cc25fca9101843ab9dca01c5a33644aca7f
2023-06-14 08:43:08 +02:00
Jarek Kobus
64078126a9 AndroidSdkDownloader: Add a handler for unarchiver error
Call logError() in this case.

Change-Id: Iab2b44ebc00fd7fe3ae755e7e575f8eb0f314c9f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-12 14:01:36 +00:00
Jarek Kobus
a250ddb668 AndroidSdkDownloader: Prolong the progress dialog for unarchiving
When the unarchiving task starts, change the label of the
progress dialog into "Unarchiving..." and make the progress
dialog infinite.

Change-Id: Ib7faf1d6d1af75bcad21200e5bd43431b70da4cc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-12 13:51:14 +00:00
hjk
860b204e38 Revert "Android: Handle some Qt deprecation related warnings"
This reverts commit a69ee57396.

Too early: QDomDocument::ParseResult was only introduced in Qt 6.5.

Change-Id: Ia2590a3f8ce5b9edec21b222d5c9211572563f97
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-06-12 11:59:59 +00:00
Eike Ziller
ea56417410 Merge remote-tracking branch 'origin/11.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: Ide0650d70d5dbd32a5492c8db24089925251af12
2023-06-12 12:33:26 +02:00
hjk
a69ee57396 Android: Handle some Qt deprecation related warnings
... in manifest editor.

Change-Id: I7e33f6e96ef88c8a5fb3f5d509bccab9ceebe799
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-12 09:45:46 +00:00
hjk
37d2240dfc Some more Qt deprecation
s/type/typeId/

Change-Id: I403af524146f0582709c1264e7517d8769dd723b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-09 09:38:20 +00:00
Eike Ziller
375db16ac4 Merge remote-tracking branch 'origin/11.0'
Change-Id: I87b22a73427cf9fc1b96075dc0db769ed3d3621c
2023-06-09 11:24:29 +02:00
hjk
e98c523b3f QmlDesigner: Fix a few more Qt deprecation related warnings
Change-Id: I245693e0aa58454f631b9150cd86f3034c5cfbe6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-09 07:57:24 +00:00
Jarek Kobus
804ad5a7f6 AndroidSdkDownloader: Reuse TaskTree
Use it for downloading and unarchiving chain of tasks.

Change-Id: I28d4c07a49933665158452ec836a4a6b2c5e23b0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-09 07:28:42 +00:00
Jarek Kobus
6cc325f845 AndroidSdkDownloader: Move private static methods into cpp
Adapt their API, when needed.

Change-Id: I2fd0a5673f5b0e83442cb800299980dc0f28832e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-06-07 14:39:53 +00:00
Jarek Kobus
34ef7d4150 AndroidSdkDownloader: Use Utils::NetworkAccessManager
Change-Id: Idd245f578ead0f22e457f9571441a4d9c9a1ce40
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-07 10:36:47 +00:00
Jarek Kobus
abb85b073a QScopeGuard: Make all usages of QScopeGuard consistent
Change-Id: Icfc35ecbdbdee8dadbb1b17789694093427c3ed9
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-07 10:35:01 +00:00
Jarek Kobus
c276a896b8 AndroidSdkDownloader: Do some reformatting
Use #pragma once.
Use Android::Internal namespace.

Change-Id: Ic5ceef259fb2c333448f2ed48a10645d6945c029
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-07 09:22:37 +00:00
hjk
7d40a35d9e Android: Use aspect as direct member in deploy step
Change-Id: I7c7037ca5ca1fb1cd3fcb7ab66a30a6f62986e20
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-01 11:36:00 +00:00
Alessandro Portale
48792c07a5 Revert "Android: Use direct member for aspect"
This reverts commit ffd0f7306b.

Reason for revert: Breaks build. Revert is temporary, will be reapplied
after I6eefe739b3aebcef1ece196ff8d70aa36738997b is in

Change-Id: I5029f710656fb89eeaf65b55742678938f249aeb
Reviewed-by: hjk <hjk@qt.io>
2023-05-23 10:28:19 +00:00