Commit Graph

1898 Commits

Author SHA1 Message Date
Alessandro Portale
24a25eed14 Use isEmpty() instead of count() or size()
Change-Id: I0a89d2808c6d041da0dc41ea5aea58e6e8759bb4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-01-20 20:56:57 +00:00
BogDan Vatra
12c74e6664 Handle Qt < 5.14.0 androiddeployqt settings file
This file is needed by cmake projects.

Fixes: QTCREATORBUG-23306
Change-Id: Ie0ffd325ca01ac5638620c258d5e8ed5bbd3259e
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-01-20 17:18:36 +00:00
hjk
0334b6e491 ProjectManager: Add convenience Task subclasses
For Compile, BuildSystem and Deployment. Unclutters user code and reduces
binary size.

Change-Id: Ia18e917bb411754162e9f4ec6056d752a020bb50
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-01-20 10:11:59 +00:00
Tobias Hunger
a3447f6eb2 Android: Fix typo
Fix typo that could possibly cause a nullptr access later on in the code.

Change-Id: I8f17ff52e54fee25b39b7661ee250956b9c513b6
Reviewed-by: hjk <hjk@qt.io>
2020-01-20 10:00:47 +00:00
Eike Ziller
bd5dae90ad Merge remote-tracking branch 'origin/4.11'
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp

Change-Id: I5e424e34db619bb769c7abc1e8651b7b40210839
2020-01-20 09:59:27 +01:00
Christian Kandeler
07544d4e07 Android: Fix crash when Kit has no Qt
Change-Id: I419bbb68d1d39fa88ca02fb644218ea78216c1ad
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-01-17 12:14:12 +00:00
Assam Boudjelthia
0a8588829f Android: detect JDK path automatically
Try to detect the install JDK path automatically.

Task-number: QTCREATORBUG-23407
Change-Id: Ie23aec9260d54f58b0284ed4a26b17b03d8ed87c
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-01-17 12:11:16 +00:00
hjk
46cb07e5d5 Android: Minor simplification for settings widget
Change-Id: Ibd0e1f6ef101a1e8b25a7882f4f454ae6b87d436
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-01-15 16:04:25 +00:00
Alessandro Portale
9904464074 Make various Q_LOGGING_CATEGORY's static
Change-Id: I43d3a198b0863d85a7fb305c7cb768f68acbd139
Reviewed-by: hjk <hjk@qt.io>
2020-01-15 14:54:10 +00:00
hjk
c75923756a Core: Provide empty implementation for IOptionPageWidget::finish()
Having it pure virtual only lead to a lot of unnecessary
re-implementation.

Change-Id: I37f71d1a160e21b93c7c73a6304b0eb6d5f0441d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-01-15 12:28:29 +00:00
Alessandro Portale
ae79b40561 Android: Fix AVD info parsing for renamed instances
Android Studio's AVD manager renames the AVD info file to match the
instance ID.

Task-number: QTCREATORBUG-23448
Change-Id: Id8ff0a53ae93b168c55442166072d14c5c84d2e0
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-01-14 21:19:56 +00:00
Assam Boudjelthia
e3d8c97998 Android: Fix sdkmanager package dependencies parse error
Fixes: QTCREATORBUG-23324
Change-Id: I14829277cc3a121af7da53ecc3bd18d34c0fcc65
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-01-14 12:49:45 +00:00
Alessandro Portale
e25212e2c5 Android: Log various avdmanager invocations
... in order to to understand what Qt Creator does when creating,
deleting or launching AVDs.

Change-Id: Iebcc9273746ad89069870ee09dab67c127b10be9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-01-14 08:11:15 +00:00
Assam Boudjelthia
d4ce0b6cfe Android: Remove unnecessary block of code from AndroidDeviceInfoList
Task-number: QTCREATORBUG-23284
Change-Id: I006ed8b63e979b4e3b27035f3b6838870ea7a11b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-01-14 08:10:49 +00:00
Assam Boudjelthia
0df5d8c2e5 Android: Improve "Add new AVD" dialog
* Re-organize the implementation to create a new AVD
* Use SystemImage instead of SdKPlatform because now
an SdkPlatform can be installed partially with a SystemImage.
The current implementation does not consider the this case,
thus we end up with an uncomplete list of installed system images.
* Add Device definitions with categories (phone, tablet, tv, etc.)
to the creation process (check -d arg in avdmanager create avd).

Task-number: QTCREATORBUG-23284
Change-Id: Id02a71ad452fb423fa2781d06ef3fcf2afa328a9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-01-13 15:20:05 +00:00
Assam Boudjelthia
6a5b182706 Android: fix avdmanager parsing error for some new device types
Currently avdmanager tool can give an error
"Error: Google <device> no longer exists as a device", due to missing
definition for new devices in device.xml.

This change temporarily removes the tag "hw.device.manufacturer" to
parse successfully, then recover it back.

Task-number: QTCREATORBUG-23284
Change-Id: I9c6f4b432d7c5d16944c9b620c4a4ecda473d45a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-01-13 12:19:19 +00:00
hjk
5cd0749830 Android: Merge androidsettings{page,widget}.{h,cpp}
du -s .obj:  106256 -> 103628

Change-Id: I960ad42e1f73d2cd11aadcf5e2eaa0d840e3e9af
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-01-13 08:30:59 +00:00
hjk
c95bde6f6a ProjectExplorer: Pass Id to BuildStep constructor
Allows to use constants in fewer places, similar to what e.g.
RunConfiguration does.

Change-Id: I9d049128206c4acf0ce14b06b66d6c090a7c5242
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-01-09 11:26:01 +00:00
Assam Boudjelthia
bccdf0f187 Set proper names and size constraints for elements of addnewavddialog
* Set sdcard size default to 512MB
* Add proper names to labels
* Default ABI to x86 as it's the recommended by Android Studio

Task-number: QTCREATORBUG-23284
Change-Id: I96ad6936b67045282933ebb31fba2c11b8af1d9d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-01-09 09:48:13 +00:00
Assam Boudjelthia
88edfdb1b2 Android: fix avdManager sdk parsing of android-Q to android-29
Some of latest system-images have SDK version as android-Q instead of
android-29, this will return an error because currect implementation
looks only for integers.

Task-number: QTCREATORBUG-23284
Change-Id: Ied6663110169edb2a5488b2724d1fa4e46131da6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-01-09 08:10:19 +00:00
Alessandro Portale
8a8efbd60d Android: Use Utils::InfoLabel in CreateAndroidManifestWizard
Task-number: QTCREATORBUG-23346
Change-Id: I4d9049625e87bc8e770982fd10c59d8030774731
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-01-09 08:08:48 +00:00
Assam Boudjelthia
6d897c00f4 Android: Add more informative fields to AVD manager UI
Task-number: QTCREATORBUG-23284
Change-Id: Ic93de1c05731360b85925acd23bdca12edc56069
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-01-08 08:36:44 +00:00
Assam Boudjelthia
50a3dae4dd Android: add refresh button for AVD list
* Added refresh button
* Moved startUpdateAvd() from updateUI() to AndroidSettingsWidget()
to avoid long load of AVD Manager UI.

Task-number: QTCREATORBUG-23284
Change-Id: I5128184f90437527d0a4a877bd277de1e6dbfad7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-01-08 07:26:41 +00:00
Alessandro Portale
8e5b587b3d Android: Log invocations of avdmanager
Change-Id: I32e4fe3d837adcb6860247f45757187902566934
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-01-08 05:48:40 +00:00
hjk
9c340a1758 Android: Use new settings page convenience
Following the pattern introduced in 809e62e373.

Change-Id: I6556aa71f37c4d5fc929a28a0abb71ea7fec788a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-01-07 13:20:25 +00:00
hjk
bfc73a356c Android: Move aabPath() to only user
This incidentally removes one of the activeBuildConfiguration uses.

Change-Id: I51b52a4da5f89b464b3b0644b09258ca76a2e872
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-01-06 09:49:41 +00:00
Alessandro Portale
804aec1417 Android: Some const& adjustments
Change-Id: Ib675463d93c060d8ef73a548b5e8943faf98c2eb
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-01-06 08:24:14 +00:00
Alessandro Portale
9264cebe24 Android: Use Utils::InfoLabel in AvdDialog
Task-number: QTCREATORBUG-23346
Change-Id: Iabbad30f4a84d9b2b5cf16ab3e3e1e0cd05eaf8e
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-01-02 09:44:36 +00:00
Alessandro Portale
b250c879af Android: Use Utils::InfoLabel in AndroidBuildApk*
Task-number: QTCREATORBUG-23346
Change-Id: Ie923d9e8f774613c1e9d0bb7dc1255acfce39cef
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-01-02 09:44:17 +00:00
Alessandro Portale
f5b92c865b Android: Use Utils::InfoLabel in AndroidSdkManagerWidget
Task-number: QTCREATORBUG-23346
Change-Id: I9d9054a81567ff64b631c7c4f0541c0daac7e6dd
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-01-02 09:43:56 +00:00
Alessandro Portale
1e87114bad Android: Use Utils::InfoLabel in AndroidSettingsWidget
Task-number: QTCREATORBUG-23346
Change-Id: I60ec7a27805fdea97ed572ad4d00150d935d4433
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-01-02 09:43:42 +00:00
hjk
d0b8e1a1ae Android: Inline *AndroidBuildApkStep::findInBuild() into callers
This is an unusual and unneeded indirection.

Change-Id: If0e241364899555f5fe6e07fed38f440bbf2812b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-12-20 14:21:46 +00:00
Christian Stenger
52106ecfef Android: Remove unused variable and function
Change-Id: I435bbd35c65a099fc202869a674431c11c76b0b9
Reviewed-by: hjk <hjk@qt.io>
2019-12-19 10:12:45 +00:00
Eike Ziller
e16876df0c Merge remote-tracking branch 'origin/4.11'
Change-Id: Ieb0bb1ebab9a5efb42d15bbeac2cd4c46a6de962
2019-12-18 09:14:14 +01:00
Alessandro Portale
b7acfc37b5 Android: Remove "qtlive" support
Productization of Qt Live preview for Android didn't happen.

Change-Id: Ie69d8193afec9b59d859bc65c45d36028247e2b9
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2019-12-18 05:46:53 +00:00
Eike Ziller
267946d100 Merge remote-tracking branch 'origin/4.11'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/boot2qt/qdbrunconfiguration.cpp
	src/plugins/boot2qt/qdbrunconfiguration.h
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qnx/qnxrunconfiguration.cpp
	src/plugins/remotelinux/remotelinuxrunconfiguration.h

Change-Id: I17c8e1bf300bb75d7317ccf7749dd3cc07709c21
2019-12-16 16:19:44 +01:00
Alessandro Portale
984938a451 Android: Log Sdk manager calls
... helps finding reason for logged parsing errors.

Change-Id: Ia544d7d042e3eb8db04c122fe9f2f8e753e8ef4a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-12-10 09:36:04 +00:00
Alessandro Portale
79bbe93c1b Android: Make more logged command calls copy&pasteable
Change-Id: I43e01efc4cb583235ad2d97150d4478b23558659
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-12-09 10:23:16 +00:00
Orgad Shaneh
49f6b0146a Merge remote-tracking branch 'origin/4.11'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/mcusupport/mcusupportrunconfiguration.cpp
	src/plugins/python/pythonproject.cpp
	src/plugins/qmakeprojectmanager/qmakestep.cpp
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I22507be28fd80c49c9fee0dff5937a40db176a82
2019-12-07 18:39:54 +02:00
hjk
3c41b91d44 ProjectExplorer: Settle on fixed set of build step lists
Even if the implementation allowed different lists than 'build'
and 'clean', that's the only set that has been used, ever.

If really needed, this could be re-instated, but for now having
them fixed removes part of the neeed for a two-phase construction
and helps to simplify user code.

Change-Id: I3df09a1829a7d020ef8963d358ea80f8d199ba13
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-12-06 14:49:59 +00:00
Alessandro Portale
51e93af2de Android: Distinguish OutputParser MarkerTag for available updates
Change-Id: Ia8389050d8be71454029e1a2848a29de33391f2a
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2019-12-06 13:37:55 +00:00
hjk
922d984950 Android: Drop special frame on run settings
Change-Id: Ibf34072ae8fa04d0c1dc72f614cdd9377fa824b1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-12-06 09:01:53 +00:00
Alessandro Portale
b5499f0360 Android: Don't attempt to handle a non-existing qt_live_viewer.apk
This remove 4 failed adb calls if the qt_live_viewer.apk is missing
(which it always is).

Task-number: QTCREATORBUG-23313
Change-Id: I8dbf833b35a9386d8d87f72c043dd019c62b4467
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2019-12-04 11:56:19 +00:00
BogDan Vatra
ce95e31766 Fix debugging armv7a & x86 when running on 64 bit targets
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>
2019-12-03 14:15:20 +00:00
BogDan Vatra
23de4630fc Android: Fix pid type
PIDs on Android (also on linux) are int64 not int

Change-Id: I6611361d4f7ab66018b3174e8fe64a41fa111350
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-12-03 14:01:24 +00:00
BogDan Vatra
e21fe24c40 Android: Get the preferred Abi from apk & device
Change-Id: I47325aaec0575dde0e9c9669e61248dac753c670
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-11-29 09:30:58 +00:00
hjk
6cc1519964 Android: Use new runconfiguration aspect update mechanism
Change-Id: I2a05f212cbba4471d66be9537b604b4e5abbc0de
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-11-25 16:37:39 +00:00
Eike Ziller
4e6142c932 Merge remote-tracking branch 'origin/4.11'
Conflicts:
	src/plugins/autotest/testresultspane.cpp
	src/plugins/cmakeprojectmanager/cmaketool.cpp

Change-Id: Iade695ac9cab8bf3e3a1abd6e2c71f4a19132ac0
2019-11-21 22:18:35 +02:00
hjk
c2127c9ec4 ProjectExplorer: Introduce and use a Target::buildSystemUpdated signal
Change-Id: I497d46866146600a1ed9162bd720c574ee4d4769
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-11-21 13:08:06 +00:00
Alessandro Portale
cd4fe07708 Android: Use numerical options for remote chmod call in uploadGdbServer
androiddeplyqt does not deploy gdbserver anymore, since Qt 5.14.
Therefore the gdbverver deployment of Qt Creator is triggered for all
devices, some of which do not support the symbolic chmod parameters
(e.g. +x).

Change-Id: I66e9fabeb0da4a1a3693c655a085d81c15f9d263
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2019-11-20 16:34:11 +00:00