Commit Graph

1898 Commits

Author SHA1 Message Date
Daniel Teske
5e1d6fcfe8 Android Settings: Fix crash on clicking remove avd twice
Task-number: QTCREATORBUG-10848
Change-Id: Iea0a815530f8a07c07f4b1562fc7189aadc85ab8
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-11-20 18:04:14 +01:00
Daniel Teske
b20ed0a0f3 Android: Fix rerun icon
Task-number: QTCREATORBUG-10850
Change-Id: Ic6ac01b1aa57b99fed899c3d9c6e6663b397afc5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-20 16:13:06 +01:00
Daniel Teske
f744372ed3 Android: Fix crash in CreateAndroidManifestWizard
Task-number: QTCREATORBUG-10833

Change-Id: I574f6c72b38e76f424b179919fee14a132b3ed4f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-11-20 11:47:31 +01:00
Eike Ziller
f61e643c95 Merge remote-tracking branch 'origin/3.0' 2013-11-20 11:25:36 +01:00
Daniel Teske
0ec265259d Android: Fix wrong return in isBoot2Qt
Change-Id: Ie697a36747118de61fb1d35cbfc71bc939a88600
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-20 09:10:58 +01:00
Daniel Teske
721d6546a6 Android: android.bat needs a special environment
See the below task for details:

Task-number: QTCREATORBUG-10575
Change-Id: I7756d8780b33ede4c3d4eac7e281c9eabfa47e35
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-19 18:21:33 +01:00
Eike Ziller
8fe04ce0ad Merge remote-tracking branch 'origin/3.0' 2013-11-19 07:41:47 +01:00
Robert Loehning
72e81db349 Android: Add missing white space
Change-Id: If0dace49b2fd353520f424d69d0bc72470e745c8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-18 18:36:18 +01:00
Daniel Teske
6fda5f2987 Android: Mark "Unknown Android version" string as translateable
Change-Id: I187775878c0fa4341b5eef0bee035fd407fe6aa8
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2013-11-18 12:36:58 +01:00
Daniel Teske
fe0e3701b7 Android: getAbis prevent endless loop
We need to check all ro.product.cpu.abi# properties,
but there's a limited amount of those. So only check up to 5 to ensure
that the loop always terminates. On irc a user reported that on his
device adb shell getprop returns  "/bin/sh: getprop: not found", so
this loop was never terminated.

Change-Id: I819b28cdbedb0bf557ba58e8495a8da5eeb8dc8d
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
2013-11-15 17:56:43 +01:00
Daniel Teske
095d911452 Android: Skip boot to qt devices
Change-Id: Ibce483484975e2817ad28ce00ea1f2d9ae06a497
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
2013-11-15 17:56:32 +01:00
Daniel Teske
899dac18f7 Android: Don't search for ant.bat on linux
Change-Id: Ia149f8eed040d5fe370286025cf76f7a6e7f47db
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2013-11-15 17:44:10 +01:00
Friedemann Kleint
11cc6eb131 Fix tr()-messages.
Change-Id: I89bf087e924d7941aaec12bb8f4324df4a93793a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-15 12:44:17 +01:00
Eike Ziller
4538ccb46c Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/gdbbridge.py

Change-Id: I32d8158c475f927b50ef06fde9ab8189ebdbcbbc
2013-11-15 10:26:57 +01:00
Daniel Teske
9705ed8a1b Android: Fix deploy regeression
Task-number: QTCREATORBUG-10777
Change-Id: Ie02ecbd95c38a50512b943e5f688bf4187a1eda5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-14 13:21:28 +01:00
Tobias Hunger
62f056a29e AndroidManifestEditorWidget: Fix build using Qt 5.0
QString::midRef is available in Qt 5.0, but QStringRef::toInt only was
added in 5.1.

Change-Id: I66666b00348c0535b4779206bd63e363f4b2c666
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-14 12:51:54 +01:00
Daniel Teske
e79cdc1690 Android: Rewrite waitForAvd()
Now takes a QFutureInterface to enable canceling and beautify the code
by splitting it up.

Change-Id: Ifedf19c3ad1a37a9b7cb6b7db8ec799ceebc5392
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-11-14 12:07:50 +01:00
Daniel Teske
adc25d1e02 Android: findAvd() return serialNumber instead of bool
So that the function can be reused by waitForAvd.

Change-Id: I0b7a86a13bf6a5f5b16d1d1cab362e7200a9a26f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-11-14 12:07:45 +01:00
Orgad Shaneh
4442a92729 Braces cleanup
Change-Id: I8413252c90a1487d291f15d92837c30ab697b245
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-14 08:13:52 +01:00
Daniel Teske
bfad6f107a AndroidDeployQtStep: Run in separate thread
Fixes the inconsistent state from
Task-number: QTCREATORBUG-10710

Change-Id: Ifabb1eef4b81e6d33244fd7af8becc453dd66669
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-13 16:39:46 +01:00
Paul Olav Tvete
27a4a006da Add "Android 4.4" as name for API level 19
Change-Id: I9fd032fe7bd45955704ad09d302fb175b7cb7ce3
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-12 12:22:32 +01:00
Daniel Teske
82f7f67ddc Android Settings Page: Disable avd settings if no sdk is configured
Task-number: QTCREATORBUG-10719
Change-Id: Icba278610119a204b19b0422bfa778d9a2c71d86
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-11-11 13:30:33 +01:00
Daniel Teske
ae55018548 Android: Fix in source builds with Qt 5.2
Now the build directory is by default android-build, so by default the
source and build directory don't clash anymore.

Task-number: QTCREATORBUG-10661
Change-Id: I054bd3790f9bc9720536aac301bee192cb9f0429
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-11-07 16:47:20 +01:00
Daniel Teske
abfa553986 Android Settings Ui: Rename label for ant location
To clarify that it points to the executable not a directory

Task-number: QTCREATORBUG-10680
Change-Id: I78b13033e21425b8f1662b63316687c13c7755a0
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-11-07 13:14:20 +01:00
Eike Ziller
49b7e95e7f Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I91b9ceba836d01086e9ccdb4499436d17195b729
2013-11-06 14:02:08 +01:00
David Schulz
7243def78c Android: Add AndroidSignalOperation.
Allows to kill and interrupt remote processes with the pid.

Change-Id: I22befc04dafbe2a7f132bddb3e17a2b48579ef3c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-05 16:55:29 +01:00
Fawzi Mohamed
08bb147153 qtsupport: collect the Abi of all QtCore libraries
ios now uses libQt5Core_iphonesimulator.a and libQt5Core.a for device
and simulator, this changes detects both architectures.

Change-Id: I0e2883c06355eb2b75aeeba4365c8aea14bb8ced
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-01 12:31:23 +01:00
Daniel Teske
c89c62c62f Android: Make AndroidRunner::stop() work
There are two different ways we used to stop a application:
am force-stop $packageName or kill -9 applicationPid. As far as I
remember that's because on some devices some one of them didn't work.
The code wasn't consistently using both though. Fix that by making it
one function, which uses both and use that one consistently.

Task-number: QTCREATORBUG-10557
Change-Id: Ib09a51e2bddae8d28a5d234e792906cc03606fda
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-11-01 11:36:47 +01:00
Eike Ziller
faf387b179 Merge remote-tracking branch 'origin/3.0' 2013-11-01 08:44:36 +01:00
Daniel Teske
c07f6d3c82 Android: Fix double slash in ndk's ant autodetection
Just use Utils::FileName, it magically does the right thing. :)

Task-number: QTCREATORBUG-10542
Change-Id: Id0d508c1e7d9317fa2e4a56ae9389e909c0c3834
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-31 12:48:30 +01:00
Daniel Teske
f9ff630346 Android: Don't create kits if there is no device
Task-number: QTCREATORBUG-10574

Change-Id: I169762ce9d2388866f1aa16f2b7128cfd42e7cee
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-30 17:04:13 +01:00
Daniel Teske
cea16f4496 Android: Make warnings in application output red too
This does include qWarning() and qDebug() output

Task-number: QTCREATORBUG-10559
Change-Id: I12e98cc25574003d1d26cda84dff5db0c323959d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-30 13:47:54 +01:00
Eike Ziller
0ddb6cac29 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	src/plugins/qmakeprojectmanager/qmakeproject.cpp

Change-Id: Id6ac9051d2564788bb180e5a99243d588312ae99
2013-10-30 13:34:46 +01:00
hjk
7ce22266de QmakeProjectManager: various renaming cleanup
Change-Id: I0433317d03aefb8e175f2208ca7ae29fa3e9fa49
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-29 18:12:12 +01:00
hjk
d7d27fccbc Rename plugins/qt4projectmanager to qmakeprojectmanager
This finally renames the plugin itself.

Change-Id: Ibdf4f4b4e9776c2fdc809e0127f3e1310de44bd1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-29 17:57:06 +01:00
hjk
ce9c2efd1f Qt4ProjectManager: Rename {Qt4,Qmake}{Project,Pr{i,o}FileNode}
Change-Id: I27139d8ccc17b665853bec4a37e80568680b5fcc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-10-29 14:54:53 +01:00
hjk
1d9d3885b4 Qt4ProjectManager: Rename {Qt4,Qmake}BuildConfiguration{Factory,}
Change-Id: Id49e347cc448f6a28271b6af775d56b6e00b4908
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-29 13:39:48 +01:00
Eike Ziller
242b7bd209 Merge remote-tracking branch 'origin/3.0' 2013-10-29 08:17:05 +01:00
Tobias Hunger
ab8999832a Debugger: Move classes into their own files
Change-Id: I89853ffb4192b0da1f34d471e250d4ec32daa3da
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-28 17:50:49 +01:00
Daniel Teske
0f094e3251 Android: Don't use -silent for ant
That command line option was new in 1.9.0. We can't yet depend on that.

Change-Id: I5231a735da7248e1102db446d6207a6a3e9dd72b
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-10-25 12:00:49 +02:00
Friedemann Kleint
119548a0ff Remove most leading/trailing blanks from translated messages.
They are a hassle for translators and reviewers alike.

Change-Id: I363138212b692cf75fe1605df8af3721315d37e1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-24 10:50:56 +02:00
Eike Ziller
c3119d1aa7 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	src/plugins/qnx/qnxutils.cpp

Change-Id: I019ad21fb4c128eb736c8ab2d09310757e3be037
2013-10-24 08:56:29 +02:00
Daniel Teske
7d42f74338 Android: Reset debugger in existing kits
For users upgrading from a broken 3.0 beta installation

Change-Id: Ieecf38f74879d1efacbfd775ab29eba9e17a4c43
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-23 13:41:12 +02:00
El Mehdi Fekari
36e6a70505 Debugger: Fix the way to register/add new debuggers
DebuggerItemManager::registerDebugger() should return the id
of the added debugger in order to use it when setting a kit's debugger
(addDebugger() creates and adds a copy of the passed
debugger object with a unique id).

The DebuggerKitInformation::setDebugger() method should set only already
existing and registered debuggers.

Task-number: QTCREATORBUG-10436

Change-Id: Icdcd1ed92aafe9eda44abf831aa9983dd6801980
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-22 20:14:14 +02:00
Daniel Teske
04ea1898b5 Android: Search for a suitable emulator before starting a new avd
Note, that we don't know the names of the started avds, so we look
for a avd that has the same abi and apiLevel.

Task-number: QTCREATORBUG-10411
Change-Id: I5f6ff3ee0dddcf2bb8fca981ccedf437e32da677
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-10-22 17:48:38 +02:00
BogDan Vatra
d8aadac323 Remove adb daemon logs
If adb daemon is not started, adb devices command will add two lines to
the output, messing up the devices list.

Change-Id: I40dcf586d2661df2de0a56aaac543c3b4739ab0d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-22 13:05:08 +02:00
Eike Ziller
4eabcdc8fd Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/git/gitplugin.cpp
	src/plugins/qt4projectmanager/qmakeproject.cpp

Change-Id: Icbd485214b1add7869233dfe0dd9c6a76bddfc7d
2013-10-22 08:40:59 +02:00
Friedemann Kleint
163f110096 Fixes in translated messages.
Change-Id: Ie1aa0547281d9a1ab31f00e44c4e09dd96c60543
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-18 13:14:14 +02:00
Daniel Teske
b8c3a79705 Android Potential Kit: set a icon
Change-Id: Iabe9a7821b1ac831c62bf52d393a5190dbb2d58a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-18 13:12:13 +02:00
Daniel Teske
1df66a18d1 Android: Rework sdkTargets() to cache the output of adb
Also rename/change highestAvailablePlatform to highestAvailableSdk.
This fixes a bug reported on irc, where the lists for sdk and ndk
were different and the highestAvailablePlatform was not available
as in the sdk.

Change-Id: I17fec9e8ce1913e933ddcf8eaa21d6bb6e14c5be
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-10-18 13:09:27 +02:00