Commit Graph

1898 Commits

Author SHA1 Message Date
hjk
1538dca81a Debugger: Continue DebuggerStartParameter cleanup
- Move sysRoot, debuggerCommand, targetAbi to DebuggerRunParameters,
  they are always the one coming from the kit.
- Move projectSource{Directory,Files} to DebuggerRunParameters,
  they are alway coming from the runConfiguration's project
- Pass RunConfiguration always as separate parameter, that's
  what related code does.

Change-Id: I9965a052237af53fa2d170701bc88b552cab12ed
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-06-26 18:14:57 +00:00
Daniel Teske
aff02184d4 Android M: Support new logcat output
Change-Id: I64ae6493b45b3f1cac82e7f5e1ae77ec3b910bc9
Task-number: QTCREATORBUG-14534
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-06-25 09:41:26 +00:00
BogDan Vatra
d6520122a2 Android: Pull the right libc.so from device.
On an 64 bit Android, libc.so for 64 bit apps is located in /system/lib64/.

Change-Id: I93f0e4658e552c9a32822706bab3e503642a8c59
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-06-22 11:09:37 +00:00
hjk
bea726e8e2 Analyzer: Replace StartMode with a useStartupProject boolean
This is what it is on the top level. The change makes it obvious
that in the valgrind(-derived) plugins the value is later wrongly
used to make a decision on whether to run the valgrind process
locally or remotely. But that's isolated in valgrind now and
can be fixed there.

Change-Id: I6fa5e669dec1f9e2cdebe42a1591d15144082a21
Reviewed-by: Anton Kreuzkamp <anton.kreuzkamp@kdab.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-06-17 09:39:21 +00:00
Tobias Hunger
274f1c0e80 Android: Fix possible crash
This can apparently get triggered with qbs projects.

Task-number: QTCREATORBUG-14493
Change-Id: Id645fbad1a0b9fdff1d1840f8ba5821b3be56b7d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-06-17 07:26:06 +00:00
Daniel Teske
2a049708e7 Android: Make api level M known
If we can't convert the string to an int value, than we are going to
read the settings file. If that fails, we fallback to  string
comparation.

Task-number: QTCREATORBUG-14537
Change-Id: I0c4c5811f246ef1835c80837879d815cfa27b5d7
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-06-12 14:06:39 +00:00
Daniel Teske
8e2370638a Android M: Use readlink without -s
Apparently the readlink on android M no longer supports that
option.

Change-Id: I27d5539ad746daa82b928801391597e43ed96cca
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-06-12 12:42:32 +00:00
Nikita Baryshnikov
aad536cdaf AndroidDeviceDialog: avoid maybe uninitialized warning
Change-Id: I7962c27c35bc1ff34655f085167c214fb628950d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-06-11 15:51:55 +00:00
Eike Ziller
6dd0e79d09 Add override to IDocument hierarchy
Change-Id: I6884f59fe0f06e380254c1f8076dd561d9df4ee3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-11 09:32:18 +00:00
Eike Ziller
4f927e4c87 Move "open" from IEditor to IDocument
For non-editor documents it currently is not used, but for editors it
makes more sense to have that on the document instead of the editor.
Most actual implementations of "open" were done in the documents already
anyhow, because it is needed for reloading.

Change-Id: I29d4df2078995cbe80172b51a9bebeecb3afad3c
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-06-10 11:21:17 +00:00
Christian Kandeler
9b0abb2489 Android: Remove unneeded variable assignments.
Change-Id: Ib00dfd415ca380039648d3c8333f7ff1c49ad9ec
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-06-10 09:55:16 +00:00
Eike Ziller
e00aa54f4e Add override keyword to IEditor & TextEditorWidget implementations
Change-Id: I403101d788d9edfea5c5c9440ab4f39ad00e81f7
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-09 04:17:42 +00:00
hjk
6eada122a3 Use free Debugger::createDebuggerRunControl() function
Allows us to un-export DebuggerRunControlFactory in an attempt to
slim down the publicly visible Debugger plugin interface

Change-Id: I0c2e7351ffa7a9d16586172816635be8ff40172e
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-29 09:19:16 +00:00
Eike Ziller
154b3e52b2 AndroidManifestEditor: Initialize SDK versions when setting up UI
Instead of initializing it when opening the file, which has nothing to do
with it.

Change-Id: I5270d424c26dde7a66c0916281f718f779b1b2ac
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-28 14:15:16 +00:00
Eike Ziller
ea859787ca AndroidManifestEditor: Fix handling of external changes
The editor was not updating the UI part if that is active when external
changes happen. Switching to XML Source would then overwrite the
external change.

Change-Id: Ib63257e75e065d151cb2a078443dc2afc8392ab8
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-28 14:15:12 +00:00
Eike Ziller
ff30cf72b0 Android manifest editor: Set focus when switching tabs
Change-Id: I4fd52b852d274783f679b056842b87ba886ddf90
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-28 14:15:07 +00:00
Eike Ziller
5e7b17804b Fixed that saving project unrelated android manifests crashed
If it didn't find a project corresponding to an android manifest, it
crashed when trying to update that non-existing project.

Change-Id: I27ccaab14c0de8845a161d16becf73eb59c1d9c3
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-28 14:15:01 +00:00
Daniel Teske
89b3d2f22c Android: Add a activity line edit to the AndroidManifest editor
And remove code for handling @strings/app_name. The default template
hasn't used that for a while and it's pretty hard to properly support
that with both a activity and app setting.

Change-Id: I394b78e0a5380232efbc52e1c71d49d9696a9b00
Task-number: QTCREATORBUG-13958
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-05-26 14:45:32 +00:00
Daniel Teske
f895d97b03 Android: Increase timeout for checkPasswd and checkKeystore
The timeout was "only" 4s, but apparently pretty much every
android tool randomly takes longer than 4s.

Increasing this timeout won't affect anyone for whom the
android tool returns in 1s, but makes it work for anyone
where the checking takes longer.

This waiting though is done in the main thread, which is pretty
bad. Moving it to a background thread isn't easy though.

Change-Id: I135b1d1ee9634005d5eb6038a46d66b6a8e97fca
Task-number: QTCREATORBUG-13175
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-05-26 10:09:48 +00:00
BogDan Vatra
a88636bd51 Make sure we pull the right app_process from device.
On arm64 devices /system/bin/app_process is a symlink to /system/bin/
app_process64, the problem is that we are pulling it also for 32bit
apps, which will make the debugging impossible because arm-linux-
androideabi-gdb 32bit can't mix the architectures.

Change-Id: I37e071456fb89051b0433ee2e7635085257616ea
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-26 09:29:45 +00:00
BogDan Vatra
7b0ae1ad0a Android 5.1 is not unknown anymore
Change-Id: Ic4b1b8d6de95a30f5542ea618ef728e64c4f7bc7
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-20 12:27:52 +00:00
BogDan Vatra
50a47cdb49 Make sure we pull from the selected device.
Change-Id: Ifbf1987e1b4322f1a0878855a12c4966bd77dc71
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-18 09:47:08 +00:00
Daniel Teske
fa401b8fab AndroidDeviceDialog: Move default device selection into Dialog
Change-Id: Ib4a272eba1f1521c082ec519ef016ad5969eb527
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-18 09:35:30 +00:00
Daniel Teske
11bcc8efe2 Android: Increase timeout of android list avd to 20s
Now that every usage of that command is using it in a separate
thread we can do that without any problems.

Change-Id: If38a734ceb5c519cd3ed28357374c83843e67c8e
Task-number: QTCREATORBUG-13634
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-05-18 09:34:26 +00:00
Daniel Teske
597096312f Android: Fix deployment to wrong avd
We used to only identify the avd by api level and abi. That was
obviously incorrect, but at the time I didn't know how to get
the actual avd name from a running emulator.

Turns out this is reasonable easy via telnet on the emulator port.

Change-Id: I387901a5294674f44399c0726abcc9feea221e8d
Task-number: QTCREATORBUG-13095
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-05-18 09:33:38 +00:00
Daniel Teske
0bd0468263 Android Avd Dialog: Fix what the Name validator accepts
While at it, make non acceptable chars give better feedback.

Change-Id: I080f01592b2c8cbd6580734ca3e6fd46b9491106
Task-number: QTCREATORBUG-13589
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-05-15 14:22:33 +00:00
Leena Miettinen
942a59a3a8 Android: Fix UI text
Open GL should be OpenGL.

Change-Id: I1d73f3feded69aedb4127024579c9fe7d13de88e
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-29 13:02:18 +00:00
Daniel Teske
557bac136b Android: Don't remove all kits on changing the ndk
Instead compare the toolchain version (and abi) and replace the old
toolchain with the new toolchain.

This requires splitting up the updating into two parts, registering
the new toolchains first, then updating the kits and last removing
old toolchains.

Change-Id: Ida6aa27e84f683ef7a3159b69bb12f93cee4ec67
Task-number: QTCREATORBUG-14243
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-04-27 13:42:01 +00:00
Daniel Teske
7bc1af275d Debugger/Android: Add the Qt's qml directory as a search path
Change-Id: I5244eda989220aa2e2f8a225294d3c1dd0d97a2a
Task-number: QTCREATORBUG-13245
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-24 09:49:04 +00:00
Eike Ziller
6c2c505228 Merge remote-tracking branch 'origin/3.4' 2015-04-23 09:39:09 +02:00
Alessandro Portale
81c7989301 Android debugging: Fix pulling of app_process
/system/bin/app_process can be a link to e.g. /system/bin/app_process32,
which we resolve first via "adb shell" before calling "adb pull".

Task-number: QTCREATORBUG-14201
Change-Id: Ic133cf0bcec3234839680584ff4807f443161e6c
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-04-22 14:23:39 +00:00
Daniel Teske
4f383f77b4 Tasks: Make the linking of compile output to Tasks more robust
Clicking on error messages is supposed to jump to the editor.
And "Show Output" on the task is supposed to select the error
in the output.

The old code just registered the task for the last line of
output. This broke for every parser that allowed for
error messages that spanned multiple lines. And was obviously
also incorrect for tasks that weren't generated due to
compile output.

Fix both of those issues by giving the IOutputParsers more
control on which lines are linked to a task.

Task-number: QTCREATORBUG-14136
Change-Id: I095922c9875620dabfb7d406f6b152c8a9b25b62
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-21 13:42:03 +00:00
Daniel Teske
50eab33aac Android: Detect install failure on Android 5.1
Change-Id: Ib0bb4ff89581a66b21431fe0009003b1f1430021
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2015-04-16 15:01:13 +00:00
Daniel Teske
2023489869 AndroidDeviceDialog: Move refreshing devices to a diffrent thread
Easy to do and makes the dialog feel marginally nicer.

Task-number: QTCREATORBUG-13123
Change-Id: I64098f1fd751100d40227c298a9e7eb358552bfb
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-04-16 10:36:18 +00:00
Daniel Teske
184abbac6a Android: For Emulators show if opengl is enabled or not
Change-Id: Ib20c1f425f91f34749bce837f14ef7a1e36273e3
Task-number: QTCREATORBUG-13615
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-04-14 15:24:13 +00:00
Daniel Teske
513239bc61 Android: Show Google AVDs
They work too, we just need to parse which api level they have.

Change-Id: I8f9da57f738d142a849ca41cb678bed6abaefd17
Task-number: QTCREATORBUG-13980
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-04-14 14:43:02 +00:00
Daniel Teske
87922f58fe Android: Allow creating a avd without a sdcard
And make that the default. SdCards are not that useful, so
creating one by default is odd.

Change-Id: Iddb34e9e3387c9c4488f7b2bc11799cfc28c9a43
Task-number: QTCREATORBUG-13590
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-04-14 13:34:45 +00:00
Eike Ziller
11590a8c5f Merge remote-tracking branch 'origin/3.4'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeproject.cpp

Change-Id: I09c5a047f7d91fecfc58c78df438afcdcdc0a8d7
2015-04-13 10:53:03 +02:00
Raphael da Silva Couto
a2c770f324 Android: Increase timeout running android.bat
At some cases, android.bat on Windows running longer.

Change-Id: I53ae90e4d7fea69b603cf8cca8c1f8ee5aa36a6a
Task-number: QTCREATORBUG-14223
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-07 12:52:40 +00:00
Eike Ziller
e56118cc1e Merge remote-tracking branch 'origin/3.4'
Conflicts:
	src/libs/extensionsystem/pluginview.cpp

Change-Id: I316199fe0a257cb085668ccb183b1590555278f2
2015-04-02 11:56:55 +02:00
Kai Koehne
46fc33d914 Don't mix iterator and const_iterator
This avoids unnecessary detaches of the Qt container data.
The mismatches where detected by defining QT_STRICT_ITERATORS;
however, this define violates the ODR (causing linker errors),
and therefore is not added permanently.

Change-Id: Idd336a9c8b394214a820437ef1b92d2101f6101c
GPush-Base: 62b0848b9c
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-02 09:40:24 +00:00
Eike Ziller
fcc6b11230 Merge remote-tracking branch 'origin/3.4'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Iaff42d30008db13ecb685e5157c82292fe48b038
2015-04-01 11:53:26 +02:00
hjk
f916c72640 Android: Handle one case of /system/bin/app_process symlink
Task-number: QTCREATORBUG-14201
Change-Id: I50441b2eeac2f2d71c16201a650a5a2e2fcb9512
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-31 07:53:32 +00:00
Christian Stenger
3dc6510d34 Android: Debugger: Avoid warning regarding release build
This is just a workaround to avoid the warning of having a release
build although building debug. In practice the validation should
be done on the main library instead of the app_process of an
Android executable.

Change-Id: I4fe4ccc790d9e373a11f851c8216362188a97b85
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-31 07:35:22 +00:00
Eike Ziller
9790d8aa00 Merge remote-tracking branch 'origin/3.4' 2015-03-24 07:40:21 +01:00
Tobias Hunger
fb6d7ce91b Remove some duplicate includes
Change-Id: If7bae084cd34c6fb0fe77f9227d9848517c0e691
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-20 14:45:04 +00:00
Eike Ziller
aee54f9df5 Merge remote-tracking branch 'origin/3.4' 2015-03-19 16:00:28 +01:00
Alessandro Portale
ec14e8bb0c AndroidManifestWidget: Hide the marks column in source mode
We don't need to set breakpoints and cannot set bookmarks. So,
let's save the space.

Change-Id: I7ff21464f2af104d7a4a7906acfb6c2917c8f7b2
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-16 16:19:22 +00:00
Eike Ziller
bf7da428fb Merge remote-tracking branch 'origin/3.4' 2015-03-16 10:27:16 +01:00
Daniel Teske
cfe69e6902 AndroidManifestWidget: Fix resizing behavior
This time for real. Change layout from
QScrollArea
 -> QStackedWidget
    -> GeneralPage
    -> EditorPage

to
QStackedWidget
  -> QScrollArea
     -> GeneralPage
  -> EditorPage

Change-Id: Id0d4baca297a5b4d58292fa72faa62b66c91a2dd
Task-number: QTCREATORBUG-14127
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-03-13 10:42:11 +00:00