summaryrefslogtreecommitdiff
path: root/src/plugins/android/androidmanifesteditorwidget.cpp
Commit message (Collapse)AuthorAgeFilesLines
* ProjectExplorer: Move some not-fully-session related bitshjk2023-03-011-2/+2
| | | | | | | | | | | | | | | ... out of SessionManager. The idea is to later move SessionManager into the Core plugin, which both is sensible conceptually and also prerequisite to merge the Bookmark plugin into TextEditor plugin. Currently, only the interface is split, as the load/save implemetations are non-mechanical to disentangle. Change-Id: I31631db3094ea192825a2ccaa6add6188662940b Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Fully qualify Tr::tr calls for the cases where lupdate needs thisAlessandro Portale2023-01-171-31/+31
| | | | | Change-Id: Icc5757376b028d9e5602751d9d8ea0a850970ebb Reviewed-by: hjk <hjk@qt.io>
* Remove GPL-3.0+ from license identifiersKai Köhne2023-01-061-1/+1
| | | | | | | | | | | | | | | Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0, this applies only to a hypothetical newer version of GPL, that doesn't exist yet. If such a version emerges, we can still decide to relicense... While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only Change was done by running find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \; Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Android: Remove Service management from AndroidManifestEditorWidgetAlessandro Portale2022-12-201-224/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Any manipulation of an AndroidManifest.xml document in the AndroidManifestEditor would heavily modify present <service/> entries. Even if the Service widget is not used. Furthermore, the service handling code would filter out any present white space. A visual XML editor must keep any present information (ideally also formatting and white spaces) intact and should only apply the minimal amount of change when saving. This can be challenging if the loaded AndroidManifest.xml has before been hand-edited. Implementing and maintaining a visual XML editor requires much effort. It has to be considered if such effort is reasonable for a specialist feature like creating Android services, especially since the "Manifest elements reference" is very well documented on developer.android.com and the Qt- specific parts in the Qt docs. This change removes the service management from the AndroidManifestEditorWidget. A good, text-based XML editor that considers the AndroidManifest schema is a valid substitute. Fixes: QTCREATORBUG-28024 Change-Id: I73ce5b5c548c5bee6fb7fe2d50d83e0ca3937208 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: Code cosmeticshjk2022-11-101-150/+146
| | | | | | Change-Id: I2a877e1f94ba9ef9e8487aa78dee95f89ec16312 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Utils: Add sorted() functionChristian Kandeler2022-10-251-2/+1
| | | | | | | | | For simpler calling code. Change-Id: Ia0a16a28770fd172f74d06a626148248bf5d3c0c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Port from qAsConst() to std::as_const()Marc Mutz2022-10-071-1/+1
| | | | | | | | | | | | | | We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. Task-number: QTBUG-99313 Change-Id: I88edd91395849574436299b8badda21bb93bea39 Reviewed-by: hjk <hjk@qt.io>
* Android: Convert to using Tr::trAlessandro Portale2022-10-071-44/+45
| | | | | Change-Id: Ie9110093101b0f49808b4da7b13ac3f47c3bb994 Reviewed-by: hjk <hjk@qt.io>
* Android: Limit the usage of qMakePairJarek Kobus2022-09-301-1/+1
| | | | | | Change-Id: Ic079174e75d3a538d5d97fc3931ddd035623f4a6 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Replace QtSupport::QtVersionNumber with QVersionNumberAlessandro Portale2022-09-191-1/+1
| | | | | | | Task-number: QTCREATORBUG-27786 Change-Id: I71a44709c264829f629c9dfce702076eda297a77 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
* Use SPDX license identifiersLucie Gérard2022-08-261-24/+2
| | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Drop Qt5: Android, IOS & WASM: Get rid of QOverloadJarek Kobus2022-07-201-24/+13
| | | | | | | | | | Add a context object into some lambdas. Change-Id: I72631aeb36703f8f335f3819796fb52148f1b377 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Utils: More forward declarations / drop unused headers [D-G]Jarek Kobus2022-05-251-0/+2
| | | | | | | | | | | Round 1 - focus on headers. For classes with initial in range [D-G]. Try to keep the same separators between different kind of headers. Change-Id: Id42cd7b3743a816f75cecb6b576c0e37cb057473 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
* Android: Remove foreach / Q_FOREACH usageArtem Sokolovskii2022-05-051-2/+2
| | | | | | | Task-number: QTCREATORBUG-27464 Change-Id: I2530688c44735bc4c69d57f9e8f392867be316f0 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: don't add all the Service meta-data for Qt 6.2+Assam Boudjelthia2022-03-081-1/+8
| | | | | | | | | These values were removed in Qt 6.2, don't add them in that case. Fixes: QTCREATORBUG-27088 Change-Id: I5560b18c0a849f7382b498097923ba425e47c40a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Rename QtSupport::BaseQtVersion to QtVersionhjk2022-01-241-1/+1
| | | | | | | | | | ... and the Utils::QtVersion enum to Utils::QtMajorVersion to avoid conflicts. Change-Id: Ib688c67388272b7204a91444155f60b8c18a56bd Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* InfoBar: Make adding more buttons possibleEike Ziller2022-01-181-1/+1
| | | | | Change-Id: Ic0c946cf3f87fe46cd06391f38e0bc71374ad340 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Android: Get the minimum sdk level based on the used Qt versionAssam Boudjelthia2021-08-261-12/+15
| | | | | | | | | | | | Currently, Creator gets the minimum sdk version from a hard-coded value (16) which is used for all projects. However, this is not ideal because some Qt versions require a specific sdk level to build and run properly. So, this change ensures that the minimum sdk value is obtained based the Qt version used in the project. Fixes: QTCREATORBUG-26127 Change-Id: I948dd18d16c3d9ca587ad7712aa4c9a1bfd53972 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: remove app lib_name field from the manifest editor UIAssam Boudjelthia2021-06-281-60/+2
| | | | | | | | | | This field is supposed to hold the name for the *.so lib that contains the main() function, ideally it shouldn't be edited by the user, because some users might use the field to set an invalid name or use the app's human readable name which is wrong. Change-Id: Ie7feb79d6231d1785c29754ed277e057181e9ca0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Merge remote-tracking branch 'origin/4.14'Eike Ziller2020-11-251-2/+0
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/designer/cpp/formclasswizard.h src/plugins/designer/cpp/formclasswizarddialog.h Change-Id: I9f9d166e1a9249022305503f9cbe571136c2a2b1
| * Remove unused variablesJarek Kobus2020-11-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | Mark some of them with Q_UNUSED, since it looks like sometimes the copy is done on purpose, to force detach or used for some hack with memory management. In one case make unused variable used again. Change-Id: I3825cd3399fa63bf6e12173c64509287d4a125e5 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | New method for show Android splashscreenFabio Falsini2020-11-171-19/+48
|/ | | | | | | | | | | New method use theme for show splashscreen in the first phase (from when an app is launched to when Qt takes control of the surface) and in the second phase draw through Qt the same drawable object used for the theme. Change-Id: I4d76322a5640cb95f99f5605c5775051e6de7daf Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-10-051-0/+2
|\ | | | | | | Change-Id: I565a0bd783dc80b53d4715fdc153dba1f1d3f7c7
| * Android: Set the manifest dirty when app icons are set or removedVille Voutilainen2020-10-021-0/+2
| | | | | | | | | | | | Task-number: QTCREATORBUG-24700 Change-Id: I862b5a17f47c7c6bbf7900b8923a246b8e902190 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* | Add control for set Android manifest screenOrientation paramFabio Falsini2020-09-261-2/+44
| | | | | | | | | | | | | | | | | | | | | | Android manifest have a param called screenOrientation for instruct Android to show the app in landscape mode, portrait mode and so on. This patch add a control allowing to set the preferred one by selecting from the list of all currently availables. Change-Id: Id53dd8aa1efaa603bc30b02c8a5a8db55e97e75b Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Fix Qt 6 build of ProjectExplorer and targets & build systemsEike Ziller2020-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | QStringRef is gone. qsizetype vs int. QMultiHash::insertMulti is gone. QXmlStreamWriter writes UTF-8 by default. Task-number: QTCREATORBUG-24098 Change-Id: Id217e40a1f17993a84fc725976e9cb84618b0580 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Android: Remove unused functionsAlessandro Portale2020-09-151-29/+0
|/ | | | | | | As found by Cppcheck Change-Id: I9274fe45ed49099b52b4f8556508ec0adc676386 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: re-organize manifest editor widgetAssam Boudjelthia2020-07-221-319/+332
| | | | | | | | | 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>
* Core/Utils: Migrate further to Utils::Idhjk2020-07-061-2/+2
| | | | | | | | 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: parse image file names from manifestVille Voutilainen2020-06-261-5/+39
| | | | | | | | | | 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>
* Move InfoBar to UtilsEike Ziller2020-06-181-5/+5
| | | | | | | | | 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>
* 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: add a splash screen editor to manifest editorVille Voutilainen2020-06-071-40/+79
| | | | | | | | 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>
* Remove unnecessary removeContextObject callsEike Ziller2020-05-271-6/+0
| | | | | | | They are removed on deletion now. Change-Id: I08461ea4938e24ab450df013a0f8f820032381da Reviewed-by: hjk <hjk@qt.io>
* Android: add service editor to manifest editorVille Voutilainen2020-05-251-7/+231
| | | | | | Task-number: QTCREATORBUG-23937 Change-Id: Iec0435721504df744ec985bd3e5cefcc0700e852 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-071-6/+5
|\ | | | | | | | | | | | | Conflicts: src/plugins/android/androidmanifesteditorwidget.cpp Change-Id: I8143d9e02837dcd78a637da7b333a6eeebb105cb
| * Android: fix manifest editor appending lib_name meta-dataAssam Boudjelthia2020-04-031-6/+5
| | | | | | | | | | | | | | | | | | The manifest editor is always adding the meta-data part for "android.app.lib_name" because parseMetaData() is wrongfully returning false. Change-Id: Ic5f1971e98f213b6fe517bf6605120b21ca51508 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
| * Android: fix a thinko in syncing icons to widgetsVille Voutilainen2020-04-031-13/+21
| | | | | | | | | | | | | | | | | | | | The path can't be set unconditionally, and copyIcon sets the path when necessary. So call copyIcon here. Task-number: QTCREATORBUG-23747 Change-Id: I72a61798ad54c94a5c2a30bb313eb234f51d5ff3 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-03-191-1/+0
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.cpp Change-Id: I2a0ccb84560174c5170d5baaff526c0e095f0ba0
| * Android: remove unnecessary minimumSize limit to permissions listViewAssam Boudjelthia2020-03-181-1/+0
| | | | | | | | | | | | | | | | | | The minimumSize can cause the manifest editor UI to have a vertical scroll bar even if it's not needed on some small displays. Change-Id: I78b855d63d5a5f16a77ce58b86f0537f526aec44 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Android: turn manifest editor application icons into widgetsVille Voutilainen2020-03-061-322/+6
|/ | | | | Change-Id: If192b1b4809cd68ebd214f3fd82e26c7818df32f Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Disable androidMinSdkVersion & androidTargetSdkVersion editing if neededBogDan Vatra2020-03-061-2/+6
| | | | | | | | | | | Starting with Qt 5.15 we moved sdk min & target versions from AndroidManifest.xml file to build.gradle (the change was needed by android gradle plugin). Fixes: QTBUG-70817 Change-Id: I3b493d88da1a4a98f1a6d8ebadc26aebfc601090 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: fix minor syntax issuesAssam Boudjelthia2020-03-031-2/+2
| | | | | | | | This fixes minor things missed in previous commit b081d7dc8f60d921d581112aaf67adb85ab3a345. Change-Id: I47c0703a81726d7c0c2bf01d844e39096424ea5e Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: place add permissions combobox on top of the list viewAssam Boudjelthia2020-03-031-13/+13
| | | | | | | | | | | It's more convenient to have the add permissions combobox on top of the list view, so that it would be directly visible without needing to scroll down, especially if on non-fullscreen mode or small screen. Task-number: QTCREATORBUG-23283 Change-Id: If3ef29fc91dd38f00d03ec63ce56103728c4b5f9 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: allow style extraction method selection to the manifest editorAssam Boudjelthia2020-03-031-7/+41
| | | | | | | | | Make a bit more easier to choose the method of style extraction to the manifest editor UI. Task-number: QTCREATORBUG-23283 Change-Id: I65ad52f07d31913cf091ef4ef1693617ac82d4ad Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: make icon removal actually workVille Voutilainen2020-02-251-64/+201
| | | | | | | | | Also adjusts icon preview sizes and adds a master icon from which the other icons are generated. Task-number: QTCREATORBUG-23283 Change-Id: I21c3d11f9b5d4d815dc6d9ad7c2363b67767d03a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: Automatically use the correct NDK for each Qt versionAssam Boudjelthia2020-02-171-2/+6
| | | | | | | | | | | | | 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>
* Android: make the manifest editor's icon selector's layout more compactVille Voutilainen2020-01-301-0/+6
| | | | | | Change-Id: I89c6aba9ebffd02521f0c849f5dcad40245ce5db Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: make manifest editor icon buttons more self-evidentVille Voutilainen2020-01-291-18/+72
| | | | | | | Task-number: QTCREATORBUG-23283 Change-Id: I727a0c808c2ce5a50b696889ac973692a03422be Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: Simplify code in manifest editorhjk2019-11-181-28/+21
| | | | | Change-Id: I1a54cc1d59b9fdf03083363cc26c25f72e893006 Reviewed-by: Christian Stenger <christian.stenger@qt.io>