aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android
Commit message (Collapse)AuthorAgeFilesLines
* Android: Warn if the selected device main ABI is not selectedAssam Boudjelthia2020-07-232-0/+14
| | | | | | Task-number: QTCREATORBUG-23291 Change-Id: I2ae13edaee30c6548a37e077c18f508a42b42d25 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: Fix rendering of settings background in dark modeAlessandro Portale2020-07-232-436/+396
| | | | | | | | | | | | | | | | | | | | | This amends faad83d5a37448b472af2efa76b7193c83f2c1f1 by undoing the insertion of a QScrollArea + QWidget under the whole form. The reason for adding this was to be able to scroll down to the license agreements. Since Core::SettingsDialog already puts the settings widget into a QScrollArea, we have two of those and one is superfluous. When using a dark theme (e.g. flat-dark), this extra QScrollArea introduces wrong background color. Also, it complicates the already quite blown androidsettingswidget.ui This change removes the QSrollArea + QWidget while keeping the feature of scrolling to the license text. This is achieved by searching through the parent chain for a QScrollArea and using the first found one for scrolling. Task-number: QTCREATORBUG-24379 Change-Id: I2bdae9367eb06b68fa47badf2556eb1ec7ebcafb Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: Set more columns in AVD table to ResizeToContentsAlessandro Portale2020-07-231-1/+3
| | | | | | | Give the columns with potentailly more content some space. Change-Id: I4c213f97df077801e3b11ef09519973a61c58c4f Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: move tooltip from ui to widget class and shorten long phrasesAssam Boudjelthia2020-07-232-10/+16
| | | | | Change-Id: I15bd9f54e7d4dbc3fae62b331172d6bc8e74e7ad Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: fix a title capitalizationAssam Boudjelthia2020-07-222-2/+2
| | | | | Change-Id: I5b22d95b85543f110f7c292d06112c1b72c337bf Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: fix settings widget palelette in dark modeAssam Boudjelthia2020-07-221-7/+1
| | | | | Change-Id: I2ef4f0d510bbbe732c790134b39a9ea5cb0af2fc Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: reset margins in settings widget pageAssam Boudjelthia2020-07-221-15/+0
| | | | | Change-Id: Ib295c25867242f729d6cd2e1516411f6f7df83d7 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: fix jdk path retreival on linuxAssam Boudjelthia2020-07-221-1/+2
| | | | | Change-Id: I4303b5f5636dce0096ae73ef6229a579b7fee202 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: Fix initial validating with clean settings and default pathsAlessandro Portale2020-07-221-13/+9
| | | | | | | | | | | | | | Relying on the PathChooser::rawPathChanged handlers to initially validate default paths with clean settings does not work (I think) because of a mix of interdependent (via m_androidConfig) synchronous and asynchronous validations. Let's assign the initial values for jdk, sdk and openssl also to m_androidConfig, so that everything works on the first run. Task-number: QTCREATORBUG-24372 Change-Id: Id6945d7bf81949a1f90cd20f9b3bd4e14a5bbe07 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: set copy gradle templates checkbox to false by defaultAssam Boudjelthia2020-07-221-1/+1
| | | | | | | | | The Gradle files are usually not modified by the user, so it makes sense to make the default behavior not to copy them, unless explicitly set by the user. Change-Id: I67a5a8ea402def55a65a4e98588c57a598c5f7d0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: re-organize manifest editor widgetAssam Boudjelthia2020-07-222-319/+341
| | | | | | | | | The current manifest editor has too many things at once with a long scroll bar, that can be overwhelming, this changes that by re-organizing elements and grouping others. Change-Id: Ie997af475939effbc575fa9e2a1d20184e943ff1 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: Fix that Android Studio's jdk does not get detected (Windows)Alessandro Portale2020-07-211-0/+25
| | | | | | | | | If all jdk detection methods on Windows remain unsuccessful, let's try to find an installation of Android Studio via the registry and use the "jre" folder (which is actually a jdk) from there. Change-Id: Ie4d7a4c5cc56f0b4675c86e436c3f1007994633c Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: re-organize "create templates" buttonAssam Boudjelthia2020-07-212-25/+15
| | | | | | Change-Id: Ibad5498f9a50d7c8adbc81cd5be435e02cca668d Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: explain what the downloaded openssl libraries are used forAssam Boudjelthia2020-07-201-1/+1
| | | | | | | Task-number: QTCREATORBUG-24074 Change-Id: I467d59e8c30d629ed532ad9311f65a1b30fd45a5 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Fix lupdate issuesEike Ziller2020-07-171-0/+4
| | | | | Change-Id: I950d2f53fcc03ba447140f3c6957422ca40111b5 Reviewed-by: hjk <hjk@qt.io>
* Android: Use re-usable "copy and ask for overwrite" callableEike Ziller2020-07-132-74/+10
| | | | | Change-Id: I73779b5eaeebbd44fa6333f067adf220ddd77be4 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* 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-082-7/+30
| | | | | | Task-number: QTCREATORBUG-24155 Change-Id: I3675a63d5aa85b8d11be9021d1a79fac1390b26e Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: Fix compileChristian Stenger2020-07-081-1/+1
| | | | | | | Amends 3f655815be222bdbd. Change-Id: I19cd488322f50b0319ca18c094598f0bce4fcb45 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: keep manual Qt version names in the autodected kit nameAssam Boudjelthia2020-07-081-2/+6
| | | | | | | | | | With in 19154bf0e75a52f8611843fd49729b79115b7bc7, When having an offial Qt for Android and a manual Qt for Android with the name version, the kit will have the same name, avoid that by keeping the exact name of the manual versions. Change-Id: I280a286f99cbc17185a5309c8825381e03ea7ff6 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>
* Android: fix qml debugger not starting on Qt 5.14+Assam Boudjelthia2020-07-081-0/+28
| | | | | | Task-number: QTCREATORBUG-24155 Change-Id: Iddc5f7cb31a3512762d1e72b42108e5ed61bd9af Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: Prevent crash in case there is no Qt version sethjk2020-07-061-1/+1
| | | | | | | | For CMake build. Change-Id: I77946a5d7023a9cefc23baf243991949121e49ec Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Core/Utils: Migrate further to Utils::Idhjk2020-07-0616-42/+41
| | | | | | | | 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: set summary widget ticks to false by defaultAssam Boudjelthia2020-07-031-1/+1
| | | | | | | To avoid any false positives. Change-Id: I30a0056975d99a85230b83df44dd119a9f1dabcd Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: pass sdkMaanger to allEssentialsInstalled() to keep syncAssam Boudjelthia2020-07-033-6/+7
| | | | | Change-Id: Ibe8385140c0d64394941b215324b70138d6f0cdf Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: apply changes to selected packages to be installedAssam Boudjelthia2020-07-021-1/+1
| | | | | Change-Id: Ibd3c362b8b73624eb21eb283ffc021727cca9712 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: Reduce the vertical spaces in the SDK manager tabAlessandro Portale2020-07-021-15/+0
| | | | | | | ...by removing explicit values from the .ui file. Change-Id: Ic75b60d05b0060ef3825a9b02a1fdde7a9375316 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: Reduce vertical spacings in the SummaryWidgetAlessandro Portale2020-07-021-1/+3
| | | | | | | Less margins, less spacings. More space. Change-Id: Ida15baa5ba2579332d4f67edcf0c785719cbad8d Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: add description to make install stepAssam Boudjelthia2020-07-021-8/+18
| | | | | Change-Id: I6d618b2023260352a47aab400233c09416d03b59 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: don't sent logcat messages to "General Messages" tabAssam Boudjelthia2020-07-021-2/+0
| | | | | | Task-number: QTCREATORBUG-24155 Change-Id: Ie4b65aec3448eb79297688c4c4aa282da026bd47 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: align android and jdk buttons verticallyAssam Boudjelthia2020-07-021-2/+2
| | | | | Change-Id: I19463b232fc8f2e85fe948753e178b0dfc30a357 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: reduce unneeded logs for Andoroid toolchain generationAssam Boudjelthia2020-07-011-4/+2
| | | | | Change-Id: Ie76d441204d9f3179d0bd12a56815107aa01e02d Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: rephrase few logsAssam Boudjelthia2020-07-016-20/+16
| | | | | Change-Id: If03a15c88caab210fd07c61312757317ea86af2f Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: handle some TODO commentsAssam Boudjelthia2020-07-012-3/+5
| | | | | Change-Id: Id1848dccc0a9b43ed77c0bd99329a0b81705a17a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: Fix UI text capitalization and punctuationLeena Miettinen2020-07-013-10/+10
| | | | | Change-Id: I5fd24f164d45fea6e666e0e95f82273d2f91f934 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: disable controls when sdkmanager is running a taskAssam Boudjelthia2020-07-012-7/+12
| | | | | Change-Id: Ib8220fa3510a186d69e17ae46a23c5b40f1de76b Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: update to latest SDK cmdline-toolsAssam Boudjelthia2020-07-012-7/+17
| | | | | | | Also, add the --sdk_root argument which is needed. Change-Id: I85f9444b35bb31aed9670bd322f2754061cf70c6 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: remove old android toolAssam Boudjelthia2020-07-019-443/+8
| | | | | | | | Follows af7c218d95d670080893356af7a42c672f1de1a9, the old android tool is not useful anymore. Change-Id: I126ecc24622f2e90465440c86b84cdfb30c103e1 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Merge remote-tracking branch 'origin/4.13'Eike Ziller2020-07-013-83/+55
|\ | | | | | | | | | | | | Conflicts: src/plugins/android/androidsettingswidget.cpp Change-Id: Iadf1d58a1e867ae7bb2dca55d3951613cfcc3d07
| * Android: remove unnecessary validateNDK function and ticksAssam Boudjelthia2020-06-301-31/+2
| | | | | | | | | | | | | | | | The NDK is installed via sdkmanager anyways, and custom NDK paths are verified upon choosing in the file dialog and rejected if not valid. Change-Id: I18f876dfacdbc1045679c6b082a500527a933673 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * Android: remove "Bundle" from ndk nameAssam Boudjelthia2020-06-301-1/+1
| | | | | | | | | | Change-Id: I5368d77cfe3e94560fb897bfd0213fc3dec74d55 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * Android: move non UI functions from settingsWidget classAssam Boudjelthia2020-06-293-50/+52
| | | | | | | | | | Change-Id: I2d6c6806fc8b219b65d241a0243ee1edab5125a1 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Android: Fix default (Android Studio) Sdk path for WindowsAlessandro Portale2020-06-291-1/+2
|/ | | | | | | | By default, Android Studio on Windows puts the SDK into: %LOCALAPPDATA%\Android\Sdk Change-Id: Iadbb1cb5c15c6cdb581cbe07b2a0e83ac11e384e Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: recommend AdoptOpenJDK in settings UI and docsAssam Boudjelthia2020-06-261-3/+4
| | | | | | | | | | Show JDK downlaod button on Linux and point it to OpenJDK becuse it's the most used on Linux. Otherwise, recommend AdoptOpenJDK because it works on all platforms and easy to install as well. Change-Id: I94fd61262fe759b96db59a9e2abfbd063f6795f0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Android, McuSupport: Change "download" icons to "online"Alessandro Portale2020-06-261-1/+1
| | | | | | | | | The download icon might suggest that clicking that button causes an automated download/installation. Since we have similar automation in the Android settings, that could be misleading. Change-Id: Ia1e4f1cfe15f79daf090546ee7c991f93b23fd13 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: partially revert 03f6517a6a5a07fc14377f8d7c1433c9c1683869Assam Boudjelthia2020-06-261-0/+10
| | | | | Change-Id: Id2d3658343be765a5f131f48f11ee7cced67afb3 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: validate jdk path at start and reload sdkmanager after thatAssam Boudjelthia2020-06-261-0/+4
| | | | | | | | | * Validate Jdk path at the start to avoid showing valide settings on empty path. * Reload sdkmanager after jdk path is changed to reflect changes. Change-Id: Ib5eafead9d4f695cf79c55b79866bd3269dadbd5 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: fix some issues with jdk path detectionAssam Boudjelthia2020-06-264-155/+64
| | | | | | | | | | | | * There were two functions to detect jdk path, unified them. * First try to find jdk 1.8, if not found, look for newer versions. SDK Tools version 26.x needs jdk 1.8 however, the new cmdline-tools can work with the newest jdk, so the UI will warn the user if the selected jdk cannot run sdkmanager potentially because of the jdk version. Change-Id: Iee2c378598c26e8a9a8245262110ac20322a2d2b Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: remove unused functionAssam Boudjelthia2020-06-262-20/+0
| | | | | Change-Id: I9c267c9dd979ae02070b08d5d95099846749eb2f Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-15 19:28:41 +0000