aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android
Commit message (Collapse)AuthorAgeFilesLines
* Android: Fix adding Java SDK to environmentEike Ziller2019-08-121-1/+1
| | | | | | | | | 33a9a03121c1ee4b2c56f8024a457b27b202d622 broke it by inverting the condition. Task-number: QTCREATORBUG-22504 Change-Id: Id0b66ec025281e6d6c52b7309f35a3bdfb8e7170 Reviewed-by: hjk <hjk@qt.io>
* More Utils::toSet/toListhjk2019-07-042-5/+5
| | | | | | | ... and unrelated cosmetic changes. Change-Id: I591b17fd5289831e701b683f8fb47816efd1fa67 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Utils: Add toSet/toList functionshjk2019-07-021-1/+2
| | | | | | | | | As replacement for functionality that's being deprecated in Qt but still useful or needed, or that cannot easily be handled without resorting to #if QT_VERSION checks in user code. Change-Id: Id3575a54ff944bf0e89d452d13944fcaee270208 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix restoring Android build steps from ealier Qt Creator versionsEike Ziller2019-06-191-2/+3
| | | | | | | | | Revert the IDs back to what they were. Amends 26463a22190a941a6b1ba2965dfe296747beb0d5 Fixes: QTCREATORBUG-22564 Change-Id: I220e362793d525ee8f01ff9649feb2cdfc37bba3 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Fix crash when project node is not foundBogDan Vatra2019-06-171-3/+3
| | | | | | Change-Id: I235fecb579023530692742f14474ae5229237c28 Fixes: QTCREATORBUG-22564 Reviewed-by: hjk <hjk@qt.io>
* Android: Use Util::FilePath for working directory in deploy stephjk2019-06-052-20/+20
| | | | | Change-Id: I37e716f267cbcc39bc0bddc8b37e84613e048721 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Fix AndroidDeployQtStepAnton Danielsson2019-06-031-1/+1
| | | | | | | | Bug was introduced by Utils::CommandLine. Cased "executable" to be an empty string. Change-Id: I2b5cd31e3eb1d2d18252dac90de07c053de9f3ce Reviewed-by: hjk <hjk@qt.io>
* Fix incorrect assignment of qml-root-pathAnton Danielsson2019-05-311-1/+1
| | | | | Change-Id: I958427e7fdfd721c90cac52a33dbb17b0f3fdc1c Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* ProjectExplorer/Android: Some more use of Utils::CommandLinehjk2019-05-292-37/+28
| | | | | | | And surrounding cosmetics. Change-Id: Iad3d2d43856b1fcd9530d4a209fff9887e6cec42 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Utils: Extract a CommandLine structure from a QtcProcesshjk2019-05-292-2/+2
| | | | | | | | | | | | We regularly pass around strings or filenames or pairs of strings or filenames and stringlist etc the in the end will be used as a kind of "command line", with quite a bit of ad-hoc user code and QtcProcess::addArg etc to set them up and manipulate them. Let's have a class for that concept. Change-Id: I288ab939d853b32c717135a65242c584c2beab50 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Utils: Rename FileName to FilePathhjk2019-05-2828-200/+200
| | | | | | | | 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>
* ProjectExplorer: (Re-)start using strings for mkspecshjk2019-05-282-4/+3
| | | | | | | | Even if this is part of a directory name it is naturally closer to a "string" id than a file path. Change-Id: If66f930526744379ce86e2b18bd9eac7fabfe773 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Directly construct KitAspect::toUserOutput return valueshjk2019-05-281-2/+1
| | | | | | | Less dependent on used type and actually saves cycles. Change-Id: I87344172c330198e98c11205a80862b3b30271e4 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* ProjectExplorer: Introduce a alias for QList<Tasks>hjk2019-05-282-3/+3
| | | | | Change-Id: I91391ad22b420926b0f512cac23cfe009048b218 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: Avoid a temporary QFileInfohjk2019-05-281-1/+1
| | | | | | Change-Id: I58f31177506c1e25f07dc51d5b24ac368ebf9024 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* ProjectExplorer: Use an alias for QList<Abi>hjk2019-05-273-5/+5
| | | | | Change-Id: I69231c5974620ae30296bfc4e0ab41c900d95a3c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: Remove remaining uses of FileName::appendPath()hjk2019-05-271-6/+7
| | | | | Change-Id: I33fb650f357d93d177e5977b21b14b42894f571a Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* More FileName::appendPath() -> .pathAppended() changeshjk2019-05-272-9/+5
| | | | | Change-Id: Ibc7eb4eb3ffb64658e441aafa240b1ddc0061930 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Remove excess blank lines after namespaceOrgad Shaneh2019-05-272-2/+0
| | | | | Change-Id: I4e4f83017f2bfc2cf842c4c971ed4b05e0447e6a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* More FileName::pathAppended()hjk2019-05-202-5/+3
| | | | | Change-Id: Ie20ec34ea9712b3ec49e6233b23cef84c2019f03 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Even more FileName::appendPath() -> pathAppended()hjk2019-05-209-48/+35
| | | | | Change-Id: I0a8bc391ff3704e14df87e4fa3bc82269146f943 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Qt Creator CMake portCristian Adam2019-05-171-0/+52
| | | | | | | | | | | | | | Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Android: Inline special constructor into only userhjk2019-05-172-17/+12
| | | | | | | ... in a attempt to unify ToolChain class interfaces. Change-Id: I9135576492a4b8080317aecbe7b74775340e62e8 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Some more FileName::appendPath() -> pathAppended() changeshjk2019-05-172-3/+2
| | | | | Change-Id: Ie494f7ae8a96d97c9497b3ef38d774d2cf787b7f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Android: Simplify AndroidManifestEditorWidget::iconPathhjk2019-05-162-14/+8
| | | | | | | Avoid a use of FileName::appendPath(). Change-Id: Ifd5367dc9048bf379362d594d32809e0971e9524 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Some more FileName::appendPath -> pathAppended() changeshjk2019-05-152-9/+5
| | | | | Change-Id: Ia05b54f157b08353d5a9efccee48dfc212d3a489 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ProjectExplorer: Use Utils::FileName in ProcessParametershjk2019-05-152-5/+6
| | | | | | | For the command and the working directory. Change-Id: Ia69dc7100aeb57bb6e1b35f4dd4f3cf3763d8cda Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Utils: Introduce a non-mutating FileName::pathAppendedhjk2019-05-153-31/+17
| | | | | | | ... and start using it. The plan is to replace all appendPath() uses. Change-Id: I555bcfa742b99b0951b98b0c0e707422c348fadb Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ProjectExplorer: Make ToolChain::makeCommand return a FileNamehjk2019-05-153-4/+4
| | | | | | | ... instead of a QString. This is in line with the qmakeCommand(). Change-Id: I617cb03522be5ebaac6cab58a3606f659fddb833 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Utils: Replace mutating FileName::appendStringhjk2019-05-151-3/+3
| | | | | | | ... by a non-mutating .stringAppended, doing the same. Change-Id: I7adb6cae3415942cc9a80088bd75cda9d577d4a5 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ProjectExplorer: Remove BuildTargetInfoList wrapper classhjk2019-05-141-6/+5
| | | | | Change-Id: I1a2ae06ec8c5b7278abca2386834d7edd31597d7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Use functor for ToolChain creation in ToolChainFactoryhjk2019-05-132-11/+1
| | | | | Change-Id: I935eecab2f16618a2a5b34d31a79672db82c3398 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Drop Detection argument from ToolChain constructorhjk2019-05-101-2/+3
| | | | | | | | | | | | | This was used wildly inconsistently. Use a setter instead in circumstances where the context is reasonably clear. The assumption is that this will always be done at some time in all code paths. Use a new 'Uninitialized' value to avoid triggering the first update. Change-Id: I82c38cb9da3ccdbd8fbae8beefcbfa0e559ff794 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Use the fromMap(toMap()) pattern to clone deviceshjk2019-05-102-6/+0
| | | | | Change-Id: Ie6e73f5ef1019907dd311aac116d71f08b5a5202 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Replace ToolChainFactory::supportedLanguangehjk2019-05-092-6/+1
| | | | | | | ... by a member-based approach. Change-Id: I5c7fef196df6c37fd26c60a58c774426eca562a0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Replace ToolChainFactory::canRestorehjk2019-05-092-6/+1
| | | | | | | ... by a member-based check. Change-Id: Id7d19e488695e76ea17cf2d02c7b6eb2cd0246cc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge remote-tracking branch 'origin/4.9'Eike Ziller2019-05-081-4/+0
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/howto/creator-sidebar-views.qdoc doc/src/howto/creator-ui.qdoc qbs/modules/qtc/qtc.qbs qtcreator.pri src/plugins/autotest/testresultmodel.cpp src/plugins/autotest/testresultmodel.h Change-Id: I24cc585ca7782cb1d9cb0b8b73b46892b41937fd
| * Android: fix avd creation for google play imagesBogDan Vatra2019-05-031-4/+0
| | | | | | | | | | | | | | | | Latest avdmanager doesn't support "--tag" argument anymore and it fails big time. Change-Id: I9b1296a1813623d44add3e9e783b8395e6865cf2 Reviewed-by: hjk <hjk@qt.io>
* | Android: Nuke mips[64] supportBogDan Vatra2019-05-072-25/+2
| | | | | | | | | | | | | | | | There is no mips[64] support in Android anymore. Change-Id: Ia7829e06c8e5658fb6ee9d20ea34d621a9651f37 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Fix Qt version for auto-detected kitsEike Ziller2019-05-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a regression in d4565be6557fca844dcf4bf427e0ff9c0838df50 that leads to all desktop Kits being assigned a default desktop Qt version, even though the installer registered these kits with a specific Qt. Implementations of KitAspect::setup may not unconditionally override an existing value, since it is called on the kits restored from the install settings. This is needed because the installer registers toolchains and debuggers by referring to them via an ABI ("this kit has a debugger that can handle this specific ABI"), since the installer doesn't know e.g. about installed MSVC toolchains itself. That's why ToolChainKitAspect and DebuggerKitAspect may modify an existing value in their "setup" method. If this should be moved somewhere else, e.g. "fix", should be investigated, but in a separate refactoring. Change-Id: Ibd99e4da03cd7130c49294f4ac79cd8e346fb1b7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Android: Add proper QBS supportBogDan Vatra2019-04-266-47/+80
| | | | | | | | | | | | | | | | | | | | | | | | 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: Rework BuildApkWidgethjk2019-04-255-446/+246
| | | | | | | | | | | | | | | | | | | | Merge BuildApkInnerWidget into BuildApkWidget and simplify layout structure. The inner .ui managed three of the groupboxes, the outer added two more manually. Change-Id: If4b54fa569952a9bb5eedb889a271827d8a88577 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | ProjectExplorer: Switch order of template parametershjk2019-04-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | ... of SimpleRunWorkerFactory. This requires being explicit about the SimpleTargetRunner worker default, but makes the template re-usable for current users of RunWorker::registerWorker() which I would like to phase out now, for less variations in the RunWorkerFactory setup. Change-Id: I32638437e5bb29f143650f5fde706711ab25accf Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@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>
* | Merge remote-tracking branch 'origin/4.9'Eike Ziller2019-03-211-1/+1
|\| | | | | | | Change-Id: If36258b8e572b5c7875433a31a836e4f06e27286
| * Android: Use QPalette::window() instead of background()hjk2019-03-211-1/+1
| | | | | | | | | | | | | | To avoid deprecation warnings. Change-Id: I802375afa8b0e717ab16fb209e719348900d0604 Reviewed-by: Eike Ziller <eike.ziller@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>
* | 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: Replace one overload of RunControl::registerWorkerhjk2019-03-201-10/+22
| | | | | | | | | | | | | | | | | | | | ... by using factory members in the plugin pimpl. This also (intentionally) transfers ownership of the factories to the plugins, effectively progressing on the "FIXME:" in runcontrol.h:164. Change-Id: Ia75ee034d25a75b5d5bff6b2fa2b3471347d1a14 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 16:14:32 +0000