summaryrefslogtreecommitdiff
path: root/src/plugins/android/androiddebugsupport.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Android: Automatically use the correct NDK for each Qt versionAssam Boudjelthia2020-02-171-4/+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>
* Fix debugging armv7a & x86 when running on 64 bit targetsBogDan Vatra2019-12-031-1/+1
| | | | | | | | We need to choose the preferred ABI based on what it's in the package not based on what Qt supports. Change-Id: I243fbf67913af7804af868d507323c0934ad3752 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* ProjectExplorer: Store parts of active build config in runcontrolhjk2019-09-241-3/+2
| | | | | | | | ... on runcontrol creation to prevent later access. Adapt some users. There are more to come. Change-Id: I2a3fe5eea0ada4eff7d08b79a6f49694e6962c8a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android multi arch supportBogDan Vatra2019-09-161-10/+6
| | | | | | | [ChangeLog][Android] Android multi arch support for qmake Change-Id: Ib8b1874604a3392130c96fbc00b26713b3d788ae Reviewed-by: hjk <hjk@qt.io>
* QtSupport: Move qtSoPaths from Androidhjk2019-08-301-26/+2
| | | | | | | | | Also add QT_INSTALL_IMPORTS, which is used in a so-called "copy" of the code in the QtApplicationManager plugin. More is better in this case. Change-Id: Ie705d95a24664d3627875ee0463e83a13b830260 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge remote-tracking branch 'origin/4.10'Tim Jenssen2019-07-041-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/libs/utils/synchronousprocess.cpp src/plugins/baremetal/iarewtoolchain.cpp src/plugins/cmakeprojectmanager/cmakeproject.cpp tests/unit/unittest/CMakeLists.txt Change-Id: I124ad492df403286751e175d27fe36487ddf6d07
| * More Utils::toSet/toListhjk2019-07-041-4/+4
| | | | | | | | | | | | | | ... and unrelated cosmetic changes. Change-Id: I591b17fd5289831e701b683f8fb47816efd1fa67 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ProjectExplorer: Use Utils::FileName for Runnable::executablehjk2019-06-211-2/+1
|/ | | | | Change-Id: I584bc18aa19a4c9886af7b13e95052dfd4350b34 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Utils: Rename FileName to FilePathhjk2019-05-281-1/+1
| | | | | | | | More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Even more FileName::appendPath() -> pathAppended()hjk2019-05-201-3/+3
| | | | | Change-Id: I0a8bc391ff3704e14df87e4fa3bc82269146f943 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Android: Add proper QBS supportBogDan Vatra2019-04-261-0/+2
| | | | | | | | | | | | Now we can use QtCreator to build, deploy, run & debug QBS projects. [ChangeLog][Android][QBS] Add Android support for QBS projects. Fixes: QTCREATORBUG-15573 Fixes: QTCREATORBUG-19880 Fixes: QTCREATORBUG-22182 Change-Id: I08b153a44dcf7ca178689c1c30fa2201c4cc0dbb Reviewed-by: hjk <hjk@qt.io>
* Android: Avoid a direct use of RunControl::runConfiguration()hjk2019-03-211-9/+5
| | | | | Change-Id: I69a610befeda78b85a2cb6285ff60a4e75ff12b4 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Avoid some visible uses of RunControl::runConfiguration()hjk2019-03-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Android: Remove some indirection when finding the minimum NDKhjk2019-02-181-2/+6
| | | | | | | | | | One instance had (base) qt version already at hand, the other was inside AndroidQtVersion itself. Also remove the typo in the function name. Change-Id: I8fb0a1cd11751e4dea1f29a99603ea6b0112c49e Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* ProjectExplorer: Rename KitInformation to KitAspectChristian Kandeler2019-02-111-1/+1
| | | | | | | | | | | 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>
* QmakeAndroidSupport: Remove pluginhjk2019-01-161-1/+2
| | | | | | | | The remaining dependency is hacked into QmakeProjectManager by using a compile time-only dependency on androidconstants.h. Change-Id: Id78125137bc75c145a072bc753276abbf0029647 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Merge remote-tracking branch 'origin/4.8'Eike Ziller2019-01-071-1/+2
|\ | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/dialogs/externaltoolconfig.ui Change-Id: Ie38e9028cee599578c59b22325d85c097335243e
| * Android: Ensure the correct sysroot is passed to debuggerChristian Stenger2018-12-171-1/+2
| | | | | | | | | | | | | | Change-Id: Iaa5e026eef658b7b729291beac30788f35c6489a Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* | ProjectExplorer: Drop the target argumenthjk2018-12-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... from ProjectNode::targetData and setTargetData, and rename them to data and setData. It was only used in the implementation to retrieve the right node, instead move the responsibility to find the right node to the caller. Current assumption is that the functions were always called on the right node already. Change-Id: I9ae7e8a7ed5c79b924b99fd9a6a652bad56d114a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | QmakeAndroid: Replace remaining AndroidQtSupporthjk2018-12-201-5/+44
|/ | | | | | | | | | | | This uses the same approach as in the previous patches: Have some generic interface in the base classes (here ProjectNode::targetData() setTargetData()) and implement on the qmake project side. Implementation for Cmake/QBS is architecture-wise possible, but not used right now, and left for later. Change-Id: I3bbf66170020cf9027a894cd66db15ec7ffbf499 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Remove hard-coded disabling of debug logsOrgad Shaneh2018-10-131-1/+1
| | | | | | | | | | | Instead, set the default level of all logs to QtWarningMsg. The call to setFilterRules overrides the user preferences in qtlogging.ini. Change-Id: Id5f6cd550d14ff7f45ae04c5d3110e0bafb0f072 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: hjk <hjk@qt.io>
* FileInProjectFinder/Debugger: Use Utils::FileName for sysrootUlf Hermann2018-08-281-2/+3
| | | | | Change-Id: Id937f927ba6137fd04f742f31d1b260afbe42db4 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* FileInProjectFinder/Debugger: Use FileNameList for search directoriesUlf Hermann2018-08-271-1/+1
| | | | | Change-Id: I8f9fa4631fda26e10e6b21abfcba9e5f74d635c2 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ProjectExplorer: Remove RunWorker::setDisplayNamehjk2018-08-211-1/+1
| | | | | | | | It has been an obsolete alias for setId for a while and downstream uses have been adapted. Change-Id: I467370aa67054599c7771e8275d28e62ddc461fa Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Android: Enable setting environment variables for android appsVikas Pachdha2018-08-021-3/+2
| | | | | Change-Id: Id4625f081d6997dcabad9b01fb09d6c9c6ef7477 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Android: Support commandline arguments for Android appVikas Pachdha2018-08-021-2/+1
| | | | | | Change-Id: I3910b68ebbf00e1b62da663a3e58224413a1929e Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: hjk <hjk@qt.io>
* Android: Use QVariant for targetData/setTargetDatahjk2018-08-011-1/+2
| | | | | | | | | This makes it more similar to the classic QAbstractItemModel::{data/setData} pattern and hides qmake-specific semantic (variables are QString*Lists*) behind something more general. Change-Id: I82d7006affd4af208be2b7640076698d13fd3a61 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Merge remote-tracking branch 'origin/4.7'Eike Ziller2018-07-101-1/+5
|\ | | | | | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri src/plugins/android/androiddebugsupport.cpp Change-Id: I01c4880850ad25432a65bb32849365d2aeb0756f
| * Android: Use ipv4 host to connect to app in androidVikas Pachdha2018-07-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | IPv6 enabled systems can have IPv4 and an IPv6 entry for localhost and macos seems to prefer IPv6 for localhost and IPv6 is not supported by adbd Task-number: QTCREATORBUG-20730 Change-Id: Ia0823fa04581afc6297e5e8d57a8034ba1b5749c Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Android: add logging for build and runVikas Pachdha2018-07-041-4/+21
| | | | | | | | | | Change-Id: Idca5a45713762aa9e2861dcc58c3bbd96cbe687e Reviewed-by: hjk <hjk@qt.io>
* | QmakeAndroid: Move some build-system agnostic items to Android basehjk2018-06-131-1/+1
|/ | | | | Change-Id: I0f258ee5e4afcb3abc7c2bbbaa612b1912a8d2b9 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Android: Remove traces of special debugger setuphjk2018-05-081-4/+0
| | | | | Change-Id: Ibf85a6e6e7c025287dd388bc5908cefc30fbaa2f Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Android: Support the extraenvvars and extraappparams optionsUlf Hermann2018-02-141-2/+4
| | | | | | | | | | The Qt/Android runtime does support passing parameters to the application. We have to pass '-e extraappparams <base64 string>' and '-e extraenvvars <base64 strings, concatenated by ";">'. This is very handy and should actually be exposed in the GUI. Change-Id: I8c84a53ab8f6f07ea5b6e01c902f53385df8b35f Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* QtSupport: Add a method to retrieve the QML pathUlf Hermann2017-09-291-1/+1
| | | | | | | | We check that qmake property in many different places. Change-Id: Ifd5efe4ad2831385493bd3afe8538929578e8fb4 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Debugger: Merge DebuggerStartParameter into *RunParametershjk2017-09-131-1/+0
| | | | | | | | | | The users (typically target specific DebuggerRunTool derived classes) are meant to use the individual setter functions nowadays, not the set up the full structure, so the members are a true implementation detail now. Change-Id: Ida04801e3230a2fe8bbadde8845e58c3077c87a5 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Merge remote-tracking branch 'origin/4.4'Eike Ziller2017-09-081-1/+1
|\ | | | | | | Change-Id: I53a31b3463b2bd8efffb1c00e5d172854d8ff5e5
| * Android: Fix search path for QML modulesBogDan Vatra2017-09-061-1/+1
| | | | | | | | | | | | | | | | QT_INSTALL_IMPORTS was used by Qt 4.x, Qt 5.x uses QT_INSTALL_QML Change-Id: I9c25ef005f3c5dc8cfc8d0b965426e22b542fb70 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* | iOS: Adapt to new setter-based DebuggerRunTool interfacehjk2017-09-041-1/+1
| | | | | | | | | | Change-Id: I96f113b831dcbd3735f743c8f12042e9b17903a4 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* | Android: Use new DebuggerRunTool interfacehjk2017-09-041-26/+24
| | | | | | | | | | Change-Id: I4e0c8670802724984827b57e5d713548ad446654 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* | Debugger: Use a QUrl for Qml server port and hosthjk2017-08-231-2/+1
|/ | | | | | | | Host and port reasonably belong together, using a QUrl makes that more explicit and follows the lead of the Qml profiler in that area. Change-Id: I754cb17d165ce6b2f25c655eeebfd8ac8f5a93c7 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Android: Fix QML debuggingv4.4.0-rc1Vikas Pachdha2017-08-151-0/+1
| | | | | | | | Specify the qml server address and use correct default loop back address in qmlengine Change-Id: I9b77cb3385041bbe79900e7f7a188ca26124bacc Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* ProjectExplorer: Rename worker dependencies to "startDependencies"Ulf Hermann2017-08-081-1/+1
| | | | | | | | There will be stopDependencies, too, which apply when stopping the runcontrol. Change-Id: Id72771d28cbb6b254572c9f93db93e0d054b890f Reviewed-by: hjk <hjk@qt.io>
* Android: Convert into a RunWorker based setuphjk2017-06-121-66/+25
| | | | | | | | | This moves all of the RunControl implementation into a single RunWorker, not yet splitting it up into separate RunWorkers which is the final goal of this series. Change-Id: I7373105603505aa4fffd7fe5ff0145f0128b34bc Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Merge remote-tracking branch 'origin/4.3'Eike Ziller2017-05-091-1/+3
|\ | | | | | | | | | | | | Conflicts: src/plugins/debugger/cdb/cdbengine.cpp Change-Id: Ib9aeccc4162c43e9ee3d85847d96678045625dd0
| * Android: Fix C++ debuggingv4.3.0-rc1Vikas Pachdha2017-05-081-1/+3
| | | | | | | | | | | | | | | | | | | | Target Async mode enabled only for ndk version > 11 Task-number: QTCREATORBUG-18111 Change-Id: I218b6c23c1da13091f0035193a43e6117748055a Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Merge remote-tracking branch 'origin/4.3'Eike Ziller2017-05-041-10/+0
|\ \ | |/ | | | | | | | | | | Conflicts: tests/auto/debugger/tst_dumpers.cpp Change-Id: Id8b53b000f94a1b5ab923db79f67bad3276d09dc
| * Revert "Android: Improve application output window by adding filters"Ulf Hermann2017-04-281-10/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit d4ca232d54a9a5dabc6955139f3d3c2dcb0875f0 and fixes QML profiling on android. Task-number: QTCREATORBUG-18120 Change-Id: I09b9062da197a4c6c0a7034f98a2bb0b41f1d559 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Debugger: Remove DebuggerRunControlhjk2017-04-281-15/+12
| | | | | | | | | | | | | | Use plain RunControl + DebuggerRunTool combo instead. Change-Id: Ib71b5eab50da667b9d71dcc6689d2643ad8ecdee Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Debugger: Reduce explicit DebuggerRunControl usehjk2017-04-271-2/+2
| | | | | | | | | | | | | | Aim is to replace it with its ProjectExplorer::RunControl base. Change-Id: I30f837050e7c016887dc4b6cfef10b947f4f88ed Reviewed-by: Christian Stenger <christian.stenger@qt.io>
View Lorry Controller Status