aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android/androidrunnerworker.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Android: fix app logcat not always displayedAssam Boudjelthia2020-07-101-5/+7
| | | | | | | | Fixes: QTCREATORBUG-23919 Fixes: QTCREATORBUG-23177 Task-number: QTCREATORBUG-23291 Change-Id: Ib053a15f2fd8e491a581268f3630725593186a47 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Android: check forward port exist before removing itAssam Boudjelthia2020-07-081-7/+28
| | | | | | Task-number: QTCREATORBUG-24155 Change-Id: I3675a63d5aa85b8d11be9021d1a79fac1390b26e Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: silence adb irrelevant SynchronousProcess error outputsAssam Boudjelthia2020-07-081-4/+6
| | | | | | Task-number: QTCREATORBUG-24155 Change-Id: Ibebc48d471ef7aeec37c99eda5c27d5419c913f3 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Core/Utils: Migrate further to Utils::Idhjk2020-07-061-1/+1
| | | | | | | | The coreplugin/id.h header is kept for downstream for now. Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66 (cherry picked from commit 430a33dcd9ac80ddb848e41f8f059102857c88aa) Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Android: rephrase few logsAssam Boudjelthia2020-07-011-8/+6
| | | | | Change-Id: If03a15c88caab210fd07c61312757317ea86af2f Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* All: Use Utils::SkipEmptyPartshjk2020-06-171-4/+5
| | | | | | Task-number: QTCREATORBUG-24098 Change-Id: Iab45de9a9c17ddc39a0e343b1175d4f6cb94b098 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Android: Properly split am start extra parameterhjk2020-06-121-2/+4
| | | | | | | Avoids, amongst others, adding an empty item if none is given. Change-Id: Ieb823e2275ca803088a19a16d7f4238422b149c4 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: Use QRegularExpression for parsing logcat outputhjk2020-06-101-19/+19
| | | | | | Task-number: QTCREATORBUG-24098 Change-Id: I3df81c06611f1547b9424e31ea1b4a4541573946 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Android: Don't use --server argument to lldb-serverhjk2020-05-261-1/+1
| | | | | | | | | We are not re-using the server process currently, and servers surviving their processes seems to lead to zombie server processes (on app uninstall(?)) Change-Id: I996fcd490e98a5101840cbbab5f640abf1f2d90b Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* Android: Shuffle debug server detection code a bithjk2020-05-191-40/+40
| | | | | | | More in one place now. Change-Id: I974c9351246ea88d8d16bcf7fb45abf763b7b7e5 Reviewed-by: David Schulz <david.schulz@qt.io>
* Android: Simplify debug server uploadhjk2020-05-191-15/+12
| | | | | Change-Id: Ib5fad98e71c29e3b28c9ba206fe20a38a75a471e Reviewed-by: David Schulz <david.schulz@qt.io>
* Android: Search LLDB in new SDK locationhjk2020-05-191-3/+29
| | | | | | | Amends 3e79c7da48b6ad. Change-Id: I6db991bc4d82000e0bb9860d85676bf1fdfb09a6 Reviewed-by: David Schulz <david.schulz@qt.io>
* Android: Also try to kill lldb-server before startinghjk2020-05-191-1/+5
| | | | | | | | ... and report upload errors. Change-Id: I87b978290a1a6c74b63195d0e1724b1da6342b38 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Android: Consolidate error handling for not found debug servershjk2020-05-191-11/+13
| | | | | Change-Id: I55d0ef38cf250536e71b6828e762f51221162830 Reviewed-by: David Schulz <david.schulz@qt.io>
* Android: Simplify gdbserver upload logic a bithjk2020-05-191-18/+12
| | | | | Change-Id: I3b1950633ef99f1ead01edc864add8bb7f8a2031 Reviewed-by: David Schulz <david.schulz@qt.io>
* Android: Determine debugger type from Kit settingshjk2020-05-121-1/+3
| | | | | Change-Id: I7e83fa1df923fd2449eecfac9c9d82bae249e6c1 Reviewed-by: David Schulz <david.schulz@qt.io>
* Android: Check existence of debug server binary before uploadhjk2020-04-291-2/+12
| | | | | | | Debugging will fail later, better catch the problem early. Change-Id: I973ff346db718e2050f5aafab068717d4e723fa6 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: Start lldb-server and attachhjk2020-04-221-55/+80
| | | | | Change-Id: Id7c45d9161d3389e9de419835c312d87916a34bc Reviewed-by: David Schulz <david.schulz@qt.io>
* Android: Setup lldb-server path in AndroidRunnerhjk2020-04-161-2/+36
| | | | | | | Currently unused, guarded by an always-false m_useLldb flag. Change-Id: Icedfa4bace3d5160cdc3d4fbcf72a22d74d0aa0f Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Android: Move gdbserver path determination to androidrunnerworker.cpphjk2020-04-151-2/+21
| | | | | | | That's the only user, and it's easier to extend to handle LLDB there. Change-Id: I7ce236e2ff509b419d52b10d086a75ff0c2ea14b Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Android: Rename some gdbServer* to debugServer*hjk2020-04-151-29/+29
| | | | | | | | | There's LLDB coming into play, and debugServer is what we use on BareMetal and RemoteLinux, too. Change-Id: I77f8545ebbe6685708215ac579789f7d4990b7be Task-number: QTCREATORBUG-23260 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Android: Automatically use the correct NDK for each Qt versionAssam Boudjelthia2020-02-171-2/+3
| | | | | | | | | | | | | Based on change 286266, we can find a correct NDK version for Qt for Andriod version. This change allows Android plugin to get relevant NDK information and registers appropriate toolchains and kits settings. [ChangeLog][Android] Automatically use correct NDK version corresponding to used Qt version. Task-number: QTCREATORBUG-23583 Change-Id: Ic6b0d7a1ae8962c075b77498de88e018a008ac3e Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Make various Q_LOGGING_CATEGORY's staticAlessandro Portale2020-01-151-1/+1
| | | | | Change-Id: I43d3a198b0863d85a7fb305c7cb768f68acbd139 Reviewed-by: hjk <hjk@qt.io>
* Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-12-161-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/boot2qt/qdbrunconfiguration.cpp src/plugins/boot2qt/qdbrunconfiguration.h src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp src/plugins/qnx/qnxrunconfiguration.cpp src/plugins/remotelinux/remotelinuxrunconfiguration.h Change-Id: I17c8e1bf300bb75d7317ccf7749dd3cc07709c21
| * Android: Make more logged command calls copy&pasteableAlessandro Portale2019-12-091-1/+1
| | | | | | | | | | Change-Id: I43e01efc4cb583235ad2d97150d4478b23558659 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Merge remote-tracking branch 'origin/4.11'Orgad Shaneh2019-12-071-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/mcusupport/mcusupportrunconfiguration.cpp src/plugins/python/pythonproject.cpp src/plugins/qmakeprojectmanager/qmakestep.cpp src/plugins/qmlprojectmanager/qmlproject.cpp src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp Change-Id: I22507be28fd80c49c9fee0dff5937a40db176a82
| * Android: Get the preferred Abi from apk & deviceBogDan Vatra2019-11-291-1/+3
| | | | | | | | | | Change-Id: I47325aaec0575dde0e9c9669e61248dac753c670 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Merge remote-tracking branch 'origin/4.11'Eike Ziller2019-11-211-3/+3
|\| | | | | | | | | | | | | | | Conflicts: src/plugins/autotest/testresultspane.cpp src/plugins/cmakeprojectmanager/cmaketool.cpp Change-Id: Iade695ac9cab8bf3e3a1abd6e2c71f4a19132ac0
| * Android: Use numerical options for remote chmod call in uploadGdbServerAlessandro Portale2019-11-201-2/+2
| | | | | | | | | | | | | | | | | | | | androiddeplyqt does not deploy gdbserver anymore, since Qt 5.14. Therefore the gdbverver deployment of Qt Creator is triggered for all devices, some of which do not support the symbolic chmod parameters (e.g. +x). Change-Id: I66e9fabeb0da4a1a3693c655a085d81c15f9d263 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Android: Fix debugging on WindowsCristian Adam2019-11-201-1/+1
| | | | | | | | | | | | | | | | The pid script was wrongly quoted on Windows resulting in not having logcat ability, and no debugging. Change-Id: Ica40d033b61b69bb2372f54f0eba19ae1d2e3c9f Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Use HostOsInfo::withExecutableSuffix instead of if/elseAlessandro Portale2019-11-141-4/+1
|/ | | | | | | Let's use our Utils. Change-Id: I8cfbce55d2b41e42e86d050433df2cfd20cebe1b Reviewed-by: hjk <hjk@qt.io>
* Android multi arch supportBogDan Vatra2019-09-161-2/+1
| | | | | | | [ChangeLog][Android] Android multi arch support for qmake Change-Id: Ib8b1874604a3392130c96fbc00b26713b3d788ae Reviewed-by: hjk <hjk@qt.io>
* Use Utils::FilePath in SynchronousProcesshjk2019-06-111-2/+3
| | | | | | | Adapt callers and surrounding code. Change-Id: Ie6c1883a44169cf9d790d06b660f46d24dc24c89 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Remove excess blank lines after namespaceOrgad Shaneh2019-05-271-1/+0
| | | | | Change-Id: I4e4f83017f2bfc2cf842c4c971ed4b05e0447e6a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* More FileName::pathAppended()hjk2019-05-201-2/+2
| | | | | Change-Id: Ie20ec34ea9712b3ec49e6233b23cef84c2019f03 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Even more FileName::appendPath() -> pathAppended()hjk2019-05-201-1/+1
| | | | | Change-Id: I0a8bc391ff3704e14df87e4fa3bc82269146f943 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Merge remote-tracking branch 'origin/4.9'Eike Ziller2019-03-251-15/+11
|\ | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp Change-Id: I170de608eaae795133105dedb76ae6f93f6e0d92
| * Android: Fix process id parsing for API 22Vikas Pachdha2019-03-211-15/+11
| | | | | | | | | | | | Task-number: QTCREATORBUG-22098 Change-Id: I8aeed9179538689083aacf9487ae0dca8feaed97 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | ProjectExplorer: Remove RunWorker::runMode()hjk2019-03-211-1/+1
| | | | | | | | | | | | | | Only used once, and that use can be replaced. Change-Id: I844254dfff9bb2b2c9c56ecbd56d2af2241fd2d8 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | ProjectExplorer: Move RunControl related classes to separate file pairhjk2019-03-131-0/+4
| | | | | | | | | | Change-Id: I5da56f80336673d595907abcc797f628be680cd5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Avoid some visible uses of RunControl::runConfiguration()hjk2019-03-121-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a long time, probably from the very beginning, a RunControl was meant to hold (a copy of) data needed for its operation, that was valid at the time of its construction, to be resilient in cases where RunConfiguration setting were changed while the RunControl was running, or to properly re-run with the original settings. Unfortunately, the task was repetitive, as RunConfiguration classes had no generic access to properties / "aspects" and there was was the runConfiguration() accessor (probably for mostly unrelated reasons in the output pane handling) which made the idea of just casting that to the original runConfiguration and access the data directly there appealing, with all the expected consequences. This patch here partially addresses the issue by copying some more of the related data at RunControl construction time and adjust the using code, avoiding most uses of the runConfiguration() accessor in a mostly mechanical matter. Complete removal appears possible, but will be less mechanical in "difficult" plugins like ios, so this is left for later. The new accessors in RunControl are very much ad-hoc, leaving room for improvement, e.g. by consolidating the access to the run config settings aspects with the other runconfig aspects or similar. For now the goal is to remove the runConfiguration() accessor, and to as much as possible fixed data after RunControl setup is finished. Next step would be to officially allow construction of RunControls without a specific RunConfiguration by setting the necessary data independently, removing the need for the various workarounds that are currently used for the purpose of faking (parts of) the effect of the non-existing RunConfiguration or refusing to operate at all, even if it would be possible. Change-Id: If8e5596da8422c70e90f97270389adbe6d0b46f2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/4.9'Eike Ziller2019-03-051-5/+5
|\| | | | | | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri src/tools/clangpchmanagerbackend/source/taskscheduler.h Change-Id: I518adaf647df412887c2a372416634359f09ad2a
| * Android: Fix UI textLeena Miettinen2019-03-041-5/+5
| | | | | | | | | | Change-Id: I918ded69e64ec3f91d7deeda086d36c6b73fdf8d Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* | Squash more deprecation warningshjk2019-02-271-1/+1
| | | | | | | | | | | | | | What a pain. Change-Id: I257e06c647933cc0b752c3c7a83a925b8b627e59 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | ProjectExplorer: Rename KitInformation to KitAspectChristian Kandeler2019-02-111-2/+2
|/ | | | | | | | | | | The name "KitInformation" does not properly convey the fact that it represents a certain *aspect* of a kit. The same goes for "KitConfigWidget", which in addition was inconsistent with "KitInformation". We now use "KitAspect" and "KitAspectWidget". Change-Id: I9804ee4cedc4d61fad533ea1dd4e4720e67fde97 Reviewed-by: hjk <hjk@qt.io>
* Merge remote-tracking branch 'origin/4.8' into 4.9Eike Ziller2019-02-041-26/+69
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/android/androidrunnerworker.cpp src/plugins/android/androidrunnerworker.h Change-Id: I52b9117c8a57dc4a34cfc09d1ae9bc76e0752bfc
| * Android: Fix gdbserver upload for Windows when using Armv8 archVikas Pachdha2019-02-011-23/+67
| | | | | | | | | | | | | | | | | | | | The gdbserver is not uploaded to device for armv7 as lib symlink is available and we can use the gdbserver packaged with the apk Task-number: QTCREATORBUG-21317 Change-Id: I263eb48bbf3cf05b969db934a928185dba10373b Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: hjk <hjk@qt.io>
* | Merge remote-tracking branch 'origin/4.8'Eike Ziller2018-12-071-3/+13
|\| | | | | | | | | | | | | Conflicts: src/plugins/cpptools/compileroptionsbuilder.cpp Change-Id: I743ea39480cc5c7b6febcd2e93713d15a3ae6d9c
| * [Android] Fix qml debugging for Qt 5.12v4.8.0BogDan Vatra2018-12-031-3/+13
| | | | | | | | | | | | | | | | | | Since Qt 5.12.0 we don't use qmljsdebugger extra intent param anymore and we need to pass qmljsdebugger to the application arguments. Fixes: QTBUG-72132 Change-Id: Icefb75e94027b145832c114fd90579bd10bcb898 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.8'Orgad Shaneh2018-12-031-9/+30
|\| | | | | | | Change-Id: I5b18233936e3b2cd674df92a694ba73b5a3ed752
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 02:07:42 +0000