Commit Graph

1898 Commits

Author SHA1 Message Date
Eike Ziller
aa2aa9bf2a Merge remote-tracking branch 'origin/4.12'
Change-Id: Id1c063ae716c3acf5e6201c15663637040aa9a35
2020-06-03 12:22:18 +02:00
Assam Boudjelthia
19154bf0e7 Android: shorten the kit and debugger names
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>
2020-06-03 09:33:07 +00:00
Eike Ziller
5b364de168 Use dialogParent() instead of mainWindow()
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>
2020-06-02 11:44:53 +00:00
hjk
2bb783a985 Android: Fix crash in build step when no Qt version is set in kit
Amends 67df868f5c.

Change-Id: I0b69a394adefedbb80dfe240c4e5b9a89d29b7b2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-05-29 10:39:21 +00:00
Eike Ziller
e5bb7d1ffe Remove unnecessary removeContextObject calls
They are removed on deletion now.

Change-Id: I08461ea4938e24ab450df013a0f8f820032381da
Reviewed-by: hjk <hjk@qt.io>
2020-05-27 08:42:00 +00:00
hjk
ad379227a9 Android: Don't use --server argument to lldb-server
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>
2020-05-26 13:12:23 +00:00
Ville Voutilainen
52188918c0 Android: add service editor to manifest editor
Task-number: QTCREATORBUG-23937
Change-Id: Iec0435721504df744ec985bd3e5cefcc0700e852
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-05-25 11:18:09 +00:00
Assam Boudjelthia
d38a6fe1df Android: allow sdkmanager to parse all generic packages
Task-number: QTCREATORBUG-23829
Change-Id: I29bd70a6703b9537e4a884e5acc53e2e2dd020cb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-05-22 11:01:21 +00:00
hjk
4c2e76385c Android: Settings widget code shuffling and cosmetics
Avoid a few casts, consts, #include

Change-Id: I803d0b728ce6f7502893d07679f638c2504629e3
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-05-20 11:24:22 +00:00
hjk
7419e09d0f Android: Settings widget code cosmetics
unnecessary indirections, const, namespaces, ...

Change-Id: I7955a81eafdce3fbb14646a57ce8436b00045278
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-05-20 10:03:24 +00:00
hjk
1b3920452a Android: Use Utils::ListModel for AvdModel
Change-Id: Iebbe137658288e60954bc63a97ddda948736fb09
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-05-20 07:52:36 +00:00
hjk
3a8bedf60b Android: Fix AvdModel::indexForAvdName
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>
2020-05-20 07:52:28 +00:00
Assam Boudjelthia
9ee24391e6 Android: warn about essential packages not found
Task-number: QTCREATORBUG-23829
Change-Id: Ic3ebd606bfde48b0f7152869a437f2f711ce1d03
Reviewed-by: hjk <hjk@qt.io>
2020-05-19 21:41:20 +00:00
hjk
5b2b8446b2 Android: AndroidManager code cosmetics
Change-Id: I228c29fb7dcf5d919bea3633ea235b5ae5a51a42
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-05-19 13:25:48 +00:00
The Qt Project
f0fd6282d2 Merge "Merge remote-tracking branch 'origin/4.12'" 2020-05-19 13:25:10 +00:00
hjk
5ce3059464 Android: Shuffle debug server detection code a bit
More in one place now.

Change-Id: I974c9351246ea88d8d16bcf7fb45abf763b7b7e5
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-05-19 13:24:23 +00:00
Eike Ziller
8292807e0d Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/android/androidextralibrarylistmodel.cpp

Change-Id: Ica69c24e83deff819e640dcb4c2682a554d8a2d2
2020-05-19 15:23:16 +02:00
hjk
08734e2ea0 Android: Simplify debug server upload
Change-Id: Ib5fad98e71c29e3b28c9ba206fe20a38a75a471e
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-05-19 13:17:49 +00:00
hjk
f3038bce08 Android: Search LLDB in new SDK location
Amends 3e79c7da48.

Change-Id: I6db991bc4d82000e0bb9860d85676bf1fdfb09a6
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-05-19 13:04:38 +00:00
hjk
8d3fd8d0de Android: Also try to kill lldb-server before starting
... and report upload errors.

Change-Id: I87b978290a1a6c74b63195d0e1724b1da6342b38
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-05-19 12:51:32 +00:00
hjk
4fb8bb9f06 Android: Consolidate error handling for not found debug servers
Change-Id: I55d0ef38cf250536e71b6828e762f51221162830
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-05-19 12:51:11 +00:00
hjk
d54c61b4bd Android: Simplify gdbserver upload logic a bit
Change-Id: I3b1950633ef99f1ead01edc864add8bb7f8a2031
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-05-19 10:41:58 +00:00
Assam Boudjelthia
1af4a9c46a Correct openssl label text
The path has both qmake and cmake paths, so rephrasing...

Change-Id: Iaec72750f1223ddf4a4acf1a16d048835a7bf2cb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-05-19 07:51:25 +00:00
Assam Boudjelthia
6b536bcbdf Android: silence assert in AndroidExtraLibraryListModel
Change-Id: I57f2f8d6df3eb2b726b7056569d5e8f809e81177
Reviewed-by: hjk <hjk@qt.io>
2020-05-18 16:11:47 +00:00
Assam Boudjelthia
2c6563c69d Android: make sure to remove the adb daemon logs from devices list
Fixes: QTCREATORBUG-21797
Change-Id: I9153a5b2a0da4826179b436945fcc4616d65bb25
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-05-18 16:11:34 +00:00
hjk
73865034c6 Android: Use adb:// in ConnectRemote
This is apparently the right thing to do anyway and also helps to
select the right emulator or device when multiple ones are connected.

In that situation otherwise an error

  "Expected a single connected device, got instead 2 -
    try setting 'ANDROID_SERIAL'"

would occur.

Change-Id: I650a221d1a321d4dd9035411f85c7a68244c20e2
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-05-15 11:37:35 +00:00
Christian Kandeler
eb96f9900a Fix clang 10 warnings about unnecessary copies in range loops
Change-Id: I3b57869b5a04528518bc432b76768b01e3f53e81
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-12 13:45:43 +00:00
hjk
3d04efa0c8 Android: Determine debugger type from Kit settings
Change-Id: I7e83fa1df923fd2449eecfac9c9d82bae249e6c1
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-05-12 09:42:17 +00:00
Eike Ziller
bf490b62e0 Merge remote-tracking branch 'origin/4.12'
Change-Id: I11936ad9e4515c3c6c9df1d949cc8116aeccd4c4
2020-05-06 09:43:20 +02:00
Assam Boudjelthia
a18c59faca Andriod: fix "always use this device" button not working
Fixes: QTCREATORBUG-23918
Change-Id: Ib9fa5bf0417f7fe028ec357b06d71577fa44c971
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-05-05 16:00:28 +00:00
hjk
d10f6a031a Android: Guard against kits without Qt version
... in AndroidConfigurations::updateAutomaticKitList.

Also, simplify code a bit.

Task-number: QTCREATORBUG-23963
Change-Id: I6835721ec8b89dec57d668393178427ffa03ff6d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-05-05 05:54:22 +00:00
hjk
4486f78e49 Android: Check existence of debug server binary before upload
Debugging will fail later, better catch the problem early.

Change-Id: I973ff346db718e2050f5aafab068717d4e723fa6
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-04-29 13:31:08 +00:00
Christian Kandeler
f4f9d9cdbb Android: Remove some unused variables
Change-Id: Id6d8f0735c410a331c406a3f3a094aac5f03f5a9
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-04-23 09:20:17 +00:00
Christian Kandeler
1c6e4fbd32 Merge output formatters and output parsers
Now only one piece of code needs to be written to both linkify output in
an output pane and create tasks for it in the issues pane.
The calling sites are also simplified. For instance, until now, build
steps had to feed their output parsers manually and then push the
created tasks up the signal stack in parallel with the actual output,
which the build manager relied upon for cross-linking the output pane
content. Afterwards, the output would get forwarded to the formatter
(and parsed for ANSI escape codes a second time). In contrast, a build
step now just forwards the process output, and task parsing as well as
output formatting is done centrally further up the stack.
Concrete user-visible improvements so far:
    - File paths in compiler/linker messages are clickable links now.
    - QtTest applications now create clickable links also when run
      as part of a build step, not just in the app output pane.

Task-number: QTCREATORBUG-22665
Change-Id: Ic9fb95b2d97f2520ab3ec653315e9219466ec08d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-23 08:47:08 +00:00
hjk
7d3c6f7c02 Android: Start lldb-server and attach
Change-Id: Id7c45d9161d3389e9de419835c312d87916a34bc
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-22 08:12:48 +00:00
Eike Ziller
ad9e4cd2f6 Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/android/androidconfigurations.cpp
	src/plugins/qtsupport/qtoptionspage.cpp

Change-Id: I91ee3e771ab630ac3a54be53ac4be6d3c1c46950
2020-04-20 08:40:54 +02:00
Assam Boudjelthia
9e057a5536 Android: add support for new SDK Tools package cmdline-tools
The newly added cmdline-tools is not used by Qt Creator.
So QC Android settings will be broken for users who have
an Android SDK installed from Android Studio, or who
updated their SDK package (i.e. tools -> cmdline-tools).

This patch fixes both of the following issues:

1- QC looks for sdkmanager tools under <SDK_ROOT>/tools/bin/sdkmanager,
and with the new SDK it's under
<SDK_ROOT>/cmdline-tools/latest/sdkmanger.

2- QC checks the version of the SDK tools and opens the
old SDK Manager for SDK tools version 25.3.0 or less.
However, since cmdline-tools is now version 1.0, it causes
QC to think this is an old version.

Fixes: QTCREATORBUG-23726
Change-Id: I7e6bbc6840d24d358f68dfa3e229799394ace950
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-04-18 16:31:36 +00:00
BogDan Vatra
fdb0cf0f6b Update openSslPath when we change the android sdk path
Change-Id: I39bd02d4f5bba8d03d4606b0de89b50778c7aa01
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-04-17 13:04:38 +00:00
Eike Ziller
602d690bab Merge remote-tracking branch 'origin/4.12'
Change-Id: Ie35e9959693b6f6f78509eea5b259d6493ef87f2
2020-04-17 08:09:55 +02:00
hjk
2795292c74 Android: Remove description of ping-pong protocol
Has not been used for a while.

Change-Id: I504ca8e83c388e3b588cc27aa978d1151ccee452
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-04-16 16:36:32 +00:00
Tobias Hunger
5a7586fca6 QtVersion: Make sure BaseQtVersion environment is set consistently
Change-Id: Ibec67dd25de6d5b17585722b8b92e24cf272ed76
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-16 14:24:01 +00:00
Christian Kandeler
6f32538c5d ProjectExplorer: Split up the IOutputParser class
For symmetry with Utils::OutputFormatter.

Task-number: QTCREATORBUG-22665
Change-Id: I148fed69dba042ad3ef26e080829c31cd3f357fd
Reviewed-by: hjk <hjk@qt.io>
2020-04-16 10:40:33 +00:00
hjk
d7b1adae78 Android: Setup lldb-server path in AndroidRunner
Currently unused, guarded by an always-false m_useLldb flag.

Change-Id: Icedfa4bace3d5160cdc3d4fbcf72a22d74d0aa0f
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-04-16 04:54:22 +00:00
Assam Boudjelthia
54f76d29c0 Android: fix sdkmanager not picking up all marked essential packages
Task-number: QTCREATORBUG-23829
Change-Id: Id436c96a8b9376d10ada92412c154c5aea2a294b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-15 08:18:46 +00:00
Assam Boudjelthia
2d4a2d19ae Android: fix potentiallyy big clone of android_openssl with --depth=1
Change-Id: I839221ee7a3fe8c1dec90d010ecbb492517fcba1
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-04-15 08:18:09 +00:00
hjk
3a1dc3c3ed Android: Move gdbserver path determination to androidrunnerworker.cpp
That's the only user, and it's easier to extend to handle LLDB there.

Change-Id: I7ce236e2ff509b419d52b10d086a75ff0c2ea14b
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-04-15 07:14:34 +00:00
hjk
6d66733d50 Android: Rename some gdbServer* to debugServer*
There's LLDB coming into play, and debugServer is what we use on
BareMetal and RemoteLinux, too.

Change-Id: I77f8545ebbe6685708215ac579789f7d4990b7be
Task-number: QTCREATORBUG-23260
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-04-15 07:14:04 +00:00
hjk
ca4908bab5 Android: Make two uses of Target::activeBuildConfiguration() explicit
This avoid the QTC_ASSERT that guards the implicit use in BuildStep::
buildConfiguration(). In the current architecture the use cannot be
avoided, but it goes away when Run and Deploy are moved below Build
instead of Target, as planned.

Change-Id: I6020a0854ea99f0102372341163dda6b4b7a8acd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-14 14:46:12 +00:00
hjk
e86a2bfdd2 Android: Simplify some PathChooser accesses
Change-Id: I270e7f662a2c148252e1b70166a784af8d0e0933
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-14 07:02:07 +00:00
hjk
68c539bb9d Utils: Replace FileChooser::path() by filePath().toString()
Keep the old method for now to ease downstream porting.

The change is kept mechanical, there's a lot of cleanup possible now
on the user code side.

Change-Id: I936baedd45b7ba057f1c789a1bec896886f48eff
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-04-09 17:45:06 +00:00