aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android
Commit message (Collapse)AuthorAgeFilesLines
...
* Android: parse image file names from manifestVille Voutilainen2020-06-267-107/+407
| | | | | | | | | | Also scales splash images without stretching and reflects them to other orientations. Task-number: QTCREATORBUG-24149 Task-number: QTCREATORBUG-24150 Change-Id: Ie23a8ba5f75132971673d3232807e941dfd50f97 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: use text button for openssl download instead of icon onlyAssam Boudjelthia2020-06-262-24/+19
| | | | | | Change-Id: I37dd0076c9dad78f8e40921facfec62a7363c27c Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Android: Set the icon size in NDK list widget to 16pxAlessandro Portale2020-06-261-0/+6
| | | | | Change-Id: I2881a3cb355236a7be7d0f803f96f90501b02b6e Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: remove native sdk and avd manager buttonsAssam Boudjelthia2020-06-2611-119/+1
| | | | | | | | | | | | | The native SDK and AVD manager buttons are no longer useful, since the original, visual Java-basd tool for managing SDK and AVDs were removed from Google's offering. The replacement is a set of command line tools and a visual tool within Android Studio, which can not directly be launched from Qt Creator. Qt Creator has it's UI on top of the command line tools. Change-Id: If660d7f566c173f46d9b2a97c9204746d33270e6 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: rephrase few UI elements in deployment settingsAssam Boudjelthia2020-06-251-9/+9
| | | | | | | Change-Id: Ief4cf44eda3342f35f828a4a1388ec45fafe8b4a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Android: describe the warning of am start args moreAssam Boudjelthia2020-06-251-1/+3
| | | | | | | Change-Id: I12312bfe2aaf7f56be31a9513833a65cba2b036f Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Android: Move connections out of .uihjk2020-06-252-34/+6
| | | | | | | ... and make them compile when using Qt 6 uic. Change-Id: If5a9a052c62aa2641c60378bb26916325aed628e Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: Make OpenSSL clone progress dialog application-modalAlessandro Portale2020-06-251-1/+1
| | | | | | | | We need to hold the user off from doing funky stuff while cloning, like for example from pressing the clone button multiple times in a row. Change-Id: Ib20218e0b0fa28852412da2b71ec5ba410d682e8 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: Trigger PathChooser validation after OpenSSL cloningAlessandro Portale2020-06-251-0/+1
| | | | | | | | In case the path was non-existent before the cloning, it should not be "red" anymore after cloning. Change-Id: If33cfbd07710e317505a9fe1e4b3b9f19a10d5db Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: handle more potential fails for when cloningAssam Boudjelthia2020-06-251-9/+29
| | | | | | Fixes: QTCREATORBUG-24200 Change-Id: I3f54f0610a70654c3711e7dc3bfd5f22863b2cd2 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: fix sdkmanager detached from AndroidSettingsWidgetAssam Boudjelthia2020-06-221-2/+2
| | | | | | | | This was caused by 7419e09d0f4899bc1c0941db14fdf2ad1e169c4b. Change-Id: I423047d353698798c712f9a32603e955ae1ee15c Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: hjk <hjk@qt.io>
* Move InfoBar to UtilsEike Ziller2020-06-182-12/+12
| | | | | | | | | The only reason it was required to be in Core plugin, was its use of Id, which now is available in Utils. Change-Id: I66ce863c24924e6448d339b3422538a7fe167336 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Fix debugging for x86 and armv7 Android buildsJoni Poikelin2020-06-171-0/+4
| | | | | | Fixes: QTCREATORBUG-24191 Change-Id: I7b3033f47a4eb0f63be351576df1540e98edb903 Reviewed-by: hjk <hjk@qt.io>
* All: Use Utils::SkipEmptyPartshjk2020-06-174-12/+21
| | | | | | Task-number: QTCREATORBUG-24098 Change-Id: Iab45de9a9c17ddc39a0e343b1175d4f6cb94b098 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Android: Use QRegularExpression instead of QRegExpChristian Stenger2020-06-165-12/+14
| | | | | | Task-number: QTCREATORBUG-24098 Change-Id: Ic19bd73dd2bac39b393bf87c4567193631b57c80 Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Consolidate RunConfigurationFactory::idshjk2020-06-151-4/+4
| | | | | | | | | | | | | | | | | | | | It was already only one id string with two names. Since it is not an id for the factory but the id of the created run configuration, settle of runConfigurationId() as accessor. The factory and id fields in RunConfigurationCreationInfo were redundant. factory always implies (runconfiguration)id (but not necessarily the other way round, in theory different factories are possible for the same runconfiguration type for different devices). So drop the id field here. In one case now factory pointers instead of ids are compared, but this is neutral there as this happens in a context of a fixed Target, device and project are fixed there, so id and factory are equally unique. Change-Id: I859aa91486a2dd4abfc7369540a3322d6ec6260d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: remove ministro deployment optionAssam Boudjelthia2020-06-154-42/+10
| | | | | | | Task-number: QTCREATORBUG-23761 Change-Id: I5be3c78a009f1747a3ccf7a6bd342969d2b8ece4 Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: hjk <hjk@qt.io>
* Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-06-151-10/+10
|\ | | | | | | | | | | | | Conflicts: src/plugins/cmakeprojectmanager/fileapiparser.cpp Change-Id: I39f8c2be859be043f506bef77de9bb5b42d38165
| * Android: don't delete the openssl dir when cloningAssam Boudjelthia2020-06-151-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Avoid removing the openssl dir if the selected path already exist and is not empty, rather just recommend selecting a different path or empty the provided one. Fixes: QTCREATORBUG-24173 Change-Id: I1e501b361d4917a59a5720146b11580e79ac32aa Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Various places: performance-for-range-copyAlessandro Portale2020-06-151-2/+2
| | | | | | | | | | Change-Id: I475990d32a5211d31a77782667a2dfedba134137 Reviewed-by: hjk <hjk@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-102-20/+19
| | | | | | | | | | | | Task-number: QTCREATORBUG-24098 Change-Id: I3df81c06611f1547b9424e31ea1b4a4541573946 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Android: Use QRegularExpression in AndroidCreateKeystoreCertificatehjk2020-06-101-1/+2
| | | | | | | | | | | | Task-number: QTCREATORBUG-24098 Change-Id: I58e26a882d8ac5015c02b9dc9b7ff4934091b18a Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* | Android: Use QRegularExpression to check package nameshjk2020-06-101-2/+3
| | | | | | | | | | | | Task-number: QTCREATORBUG-24098 Change-Id: I1082d39e65c4237592c81758fcdde614fc50d6e0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Android: Fix qbs buildChristian Kandeler2020-06-081-1/+1
| | | | | | | | | | Change-Id: Id9adcd458f22a786a60193fea6c01fd7dcc4e8f0 Reviewed-by: hjk <hjk@qt.io>
* | Android: add a splash screen editor to manifest editorVille Voutilainen2020-06-0710-61/+424
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-24013 Task-number: QTCREATORBUG-24011 Change-Id: Iea7e8ff8f9bf616612827b70de67e01801ab1229 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* | Fix clang warnings about unwanted copies in range loopsChristian Kandeler2020-06-042-2/+2
| | | | | | | | | | Change-Id: I11ae3317fd251a463809ee48917d2daf0f8b43d1 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-06-031-6/+10
|\| | | | | | | Change-Id: Id1c063ae716c3acf5e6201c15663637040aa9a35
| * Android: Fix crash in build step when no Qt version is set in kithjk2020-05-291-6/+10
| | | | | | | | | | | | | | | | Amends 67df868f5c8ff. Change-Id: I0b69a394adefedbb80dfe240c4e5b9a89d29b7b2 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* | Android: shorten the kit and debugger namesAssam Boudjelthia2020-06-031-5/+15
| | | | | | | | | | | | | | | | | | | | The multi-abi kit names are too long since they contain the full list of ABIs, this might cause build issues at least on windows host. Task-number: QTBUG-83875 Change-Id: I137fa9a177eb2143be1421129b9dbd12515a3da9 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Use dialogParent() instead of mainWindow()Eike Ziller2020-06-022-2/+2
| | | | | | | | | | | | | | | | | | | | There are very few reasons to use mainWindow() directly. Especially for modal dialogs, using dialogParent() is important, since that guarantees the stacking order in case of other dialogs currently being open. Change-Id: I7ad2c23c5034b43195eb35cfe405932a7ea003e6 Reviewed-by: hjk <hjk@qt.io>
* | Remove unnecessary removeContextObject callsEike Ziller2020-05-272-7/+0
| | | | | | | | | | | | | | They are removed on deletion now. Change-Id: I08461ea4938e24ab450df013a0f8f820032381da Reviewed-by: hjk <hjk@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: add service editor to manifest editorVille Voutilainen2020-05-258-8/+805
| | | | | | | | | | | | Task-number: QTCREATORBUG-23937 Change-Id: Iec0435721504df744ec985bd3e5cefcc0700e852 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* | Android: allow sdkmanager to parse all generic packagesAssam Boudjelthia2020-05-223-1/+55
| | | | | | | | | | | | Task-number: QTCREATORBUG-23829 Change-Id: I29bd70a6703b9537e4a884e5acc53e2e2dd020cb Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Android: Settings widget code shuffling and cosmeticshjk2020-05-201-94/+92
| | | | | | | | | | | | | | Avoid a few casts, consts, #include Change-Id: I803d0b728ce6f7502893d07679f638c2504629e3 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* | Android: Settings widget code cosmeticshjk2020-05-203-201/+188
| | | | | | | | | | | | | | unnecessary indirections, const, namespaces, ... Change-Id: I7955a81eafdce3fbb14646a57ce8436b00045278 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* | Android: Use Utils::ListModel for AvdModelhjk2020-05-201-71/+26
| | | | | | | | | | Change-Id: Iebbe137658288e60954bc63a97ddda948736fb09 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Android: Fix AvdModel::indexForAvdNamehjk2020-05-201-1/+1
| | | | | | | | | | | | | | | | This was using serialNumber instead of avdname, whereas the reverse function avdName() actually used avdname. Change-Id: Ieb91f97323f2adcf9306c90c91b145e494f177c0 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Android: warn about essential packages not foundAssam Boudjelthia2020-05-193-1/+21
| | | | | | | | | | | | Task-number: QTCREATORBUG-23829 Change-Id: Ic3ebd606bfde48b0f7152869a437f2f711ce1d03 Reviewed-by: hjk <hjk@qt.io>
* | Android: AndroidManager code cosmeticshjk2020-05-192-77/+74
| | | | | | | | | | Change-Id: I228c29fb7dcf5d919bea3633ea235b5ae5a51a42 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Merge "Merge remote-tracking branch 'origin/4.12'"The Qt Project2020-05-193-5/+9
|\ \
| * | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-193-5/+9
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/android/androidextralibrarylistmodel.cpp Change-Id: Ica69c24e83deff819e640dcb4c2682a554d8a2d2
| | * Android: silence assert in AndroidExtraLibraryListModelv4.12.1Assam Boudjelthia2020-05-181-1/+2
| | | | | | | | | | | | | | | Change-Id: I57f2f8d6df3eb2b726b7056569d5e8f809e81177 Reviewed-by: hjk <hjk@qt.io>
| | * Android: make sure to remove the adb daemon logs from devices listAssam Boudjelthia2020-05-182-4/+7
| | | | | | | | | | | | | | | | | | Fixes: QTCREATORBUG-21797 Change-Id: I9153a5b2a0da4826179b436945fcc4616d65bb25 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Android: Shuffle debug server detection code a bithjk2020-05-193-43/+43
|/ / | | | | | | | | | | | | 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>