Commit Graph

1898 Commits

Author SHA1 Message Date
Daniel Teske
723d4a973f Android: Distinguish between platforms in the ndk and the sdk
The available platforms in the ndk might not be the same as in the sdk.
This patch is renames everything using the ndk platform list to
ndkPlatforms, except the highestAvailablePlatform which wrongly uses
the ndk platform list.

Change-Id: I02d9b68bbc27b0c748281678fe654d5f4244578d
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-10-18 13:09:22 +02:00
Daniel Teske
5e10114e76 Android: Remove bestMatch calls in fallback code in buildTargetSDK
besdtMatch finds a ndk version that is at most the targetApi passed into it.
Since we are passing in the fallback and lowest possible api level that qt
supports, the function would return at most the lowest supported version.
That's not very useful and cannot have worked, so simpy return the fallback
version directly.

Change-Id: I5e4757639099af4d207f928b0335d28efd75a02b
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-10-18 13:09:18 +02:00
Daniel Teske
04cd026582 Android: Remove old android directory before deployment
Task-number: QTCREATORBUG-10290

Change-Id: I83a3ccef58ab1a4c2a486f20620a11e318c146ca
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-17 13:48:31 +02:00
hjk
35695ebb0c Qt4ProjectManager: Rename the "normal" qt4* files to qmake*
Change-Id: I5e173900a4008c72c67a30eaa9c101027c1b43af
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-10-16 14:30:05 +02:00
hjk
ebcd992577 Rename namespace Qt4ProjectManager to QmakeProjectManager
First step towards plugin renaming.

Change-Id: I8ac017660a7aa2bda0d7bb7d72ab0cfceaf6cfd2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-16 12:09:59 +02:00
Friedemann Kleint
02735fe4cb Android: Fix lupdate-warning about missing Q_OBJECT.
Change-Id: I9a55e811842bb6b1a51737f668ed249f328c9c62
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-15 17:08:05 +02:00
Daniel Teske
0a600e041a Android: Rework AndroidPacakgeInstallationStep
It derived from MakeStep which is a rather odd base class for it, make
it derive from AbstractProcessStep instead. Also implement a config
widget for it. That one does nothing, but the old one didn't do
anything interesting either.

Change-Id: I76c2311580dbb62d08524fe0f77e803fd52ffbf4
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-10-15 16:19:38 +02:00
Daniel Teske
6bd08800d7 Android: Fix crash if avds cpu's could not be determined
That can happen on strange setups with multiple avds

Task-number: QTCREATORBUG-10362
Change-Id: Ib6fef4ee3538632c2c71264d6a6c43e3bd917c69
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-15 13:45:52 +02:00
BogDan Vatra
58afa43afe Make ant silent not quiet.
quiet parameter hides aapt tool errors.

Change-Id: Iabf0386079f0f88474d4aa2be91e4d8162d5d68f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-14 15:46:44 +02:00
Daniel Teske
2bd789aeb9 Android: Detect JAVA_HOME by looking for libs/tools.jar
Task-number: QTCREATORBUG-10241
Change-Id: I8245547f851174314b99bde857f257692ed35bfb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-11 14:56:54 +02:00
hjk
a527fbe91c IDevice: Add a qmlProfilerHost function
This seems to be a better abstraction than the "pseudo dynamic cast"
in the QmlProfilerTool and the DebuggerPlugin itself.

Change-Id: If7dea70e1353852ebb6d3ce43220c0b03ccb4b00
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-10-11 13:40:53 +02:00
hjk
68a6ce2a1b Android: Minor API fixes in AndroidToolChain
Change-Id: I818ba7d95c52b87a84de6bfdaac8436258ac249a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-11 12:36:40 +02:00
Daniel Teske
7d5eebb846 Android Virtual Device: Create avds with hw.gpu.enabled
Task-number: QTCREATORBUG-10006
Change-Id: I7e10ef1280ed2388c1e9341dad32935d22ce05ed
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-11 12:22:05 +02:00
Daniel Teske
1aff7afae9 Android: Increase defailt sd card size for avds to 200 MB
Change-Id: Ic9435227e36186e320449348aee03cd62f3fa1e7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-11 12:21:25 +02:00
hjk
0d57c8fb30 Android: Don't check Qt version for secondary toolchains
Change-Id: Iee529e1c43c4b1a37d7894edee0ea4ecc81762d2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-10 19:50:41 +02:00
hjk
dd1e51076a Android: Fix debugger autodetection
Task-number: QTCREATORBUG-10341
Change-Id: I197ae5745d5caba12bce3e148ada2a589ac7f9b3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-10 19:50:18 +02:00
Robert Loehning
0bb9ab131e Normalize connect()s
Change-Id: I1305abd51cb6ae856215af63807e66c433982c26
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-10 18:27:57 +02:00
Tobias Hunger
8d7bd37bbe Android: Remove unnecessary member
Change-Id: I68f6f7f4a14d7d36ef18d2db354704309fbb0bf4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-10 16:18:14 +02:00
Friedemann Kleint
1010bd2924 Android: Fix compilation with Qt 4.
Change-Id: I8f5e310f14159238079f30dded0e5f0814d20990
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-10 15:19:58 +02:00
Christian Kandeler
f1da03c73b qbs project files: Make use of new qbsSearchPaths property.
Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-10-09 18:08:56 +02:00
Leena Miettinen
e902945b7e Android: fix UI text capitalization and punctuation
Fix typos and style issues.

Change-Id: I8d1bbccd55e7558e7f8a8bedbab95f4bb8a8478f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-09 17:50:52 +02:00
Daniel Teske
cf69783c0f Android: Restrict deployment factories to targets with the right qt
Change-Id: I753023550f76b8b1b56fbdcd5176bcfa855e66bc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-09 17:17:26 +02:00
Daniel Teske
a97dd8aba6 AndroidRunConfiguration: Take .pro file parsing into account
Disable the runconfiguration if the project could not be parsed.

Change-Id: I979315b5e38fd1d8674da68289e021e014070c54
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-09 16:36:29 +02:00
Daniel Teske
0a43f097de Android: Handle cases where the project is unparsed.
Change-Id: If1757fff8ff458610dae8cbfcf561154c7d56753
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-09 16:35:48 +02:00
Daniel Teske
37edb06c1e Android Manifest Editor: Fix various issues around min/target sdk level
Change-Id: I9b9239055301296b572e0c36c40f179b0e98c67d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-09 15:38:40 +02:00
Eike Ziller
56c3d8ffab Unify wizards with TOC and cancel button.
QTBUG-28385 is biting us over and over (QWizard doesn't have close
button nor cancel button on Mac in Qt 5), and actually there's no reason
for us having a wizard without the features from Utils::Wizard.

Task-number: QTCREATORBUG-10346
Task-number: QTBUG-28385
Change-Id: I80c0d82fe6738496c2ac03c31a1c2757ade8e266
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-09 14:31:14 +02:00
Daniel Teske
911226bf97 Android: Removing qt should remove its kits
Task-number: QTCREATORBUG-10224
Change-Id: I3d360a095ef76674e762e5bd795f21ab21685953
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-09 11:34:49 +02:00
Friedemann Kleint
a833ba350a Fix some spelling/tr-errors in Android/QNX.
Change-Id: Ia9f927c7b4108046d03158de0aa6d94026f1cfde
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-08 15:24:13 +02:00
Daniel Teske
03e76337ca AndroidExtraLibraryListModel: Fix crash on removing libs
Steps to reproduce the crash, start with the list a b a c, select the
second a and the c. Click on remove. The removeEntries will find that it
can remove two consecutive entries in one beginRemoveRows/endRemoveRows,
but will wrongly remove them starting at the first a.

The fix is too simply order the modelindexes in descendeding order such
that removing entries does not modify the rows.

Change-Id: I4be349f4bab8137075da0d8dfcef24f10dc25f92
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-07 12:13:18 +02:00
Daniel Teske
71d6b2b10d Android Manifest Editor: Eat keyboard events
And thus prevent them from affecting the wrong widget

Change-Id: Iacf326630a80c2d53e8852ea8055d7bd5f87ed68
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-02 15:16:17 +02:00
Daniel Teske
c12e933662 Android: Tweak device list view
Make the incompatible device node expand by default and disable
hopefully all ways a use can collpase. Also remove the arrow from the
title entriues, since it can't be collapsed anymore.

Change-Id: I012c3d9663ac496083f8c16d24eed4cd660d8cd0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-02 12:32:40 +02:00
Daniel Teske
7f8edfb41c AndroidPlugin: Remove dependency on qbs plugin
Task-number: QTCREATORBUG-10288
Change-Id: I2328076a7b5179e4d63becb616433627270089c4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-02 12:29:26 +02:00
Daniel Teske
c6a8af841a Android: Fix text of Open package checkbox
Change-Id: I781ab9637341c44ab8ba89169f8990b1ca87300f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-02 12:09:06 +02:00
Daniel Teske
bc3b0859bb Android: Set ANDROID_SDK_ROOT environment variable
Needed by androiddeployqt

Task-number: QTCREATORBUG-10289

Change-Id: I64abef7278fab5c9261f9f954af416410f69ce0d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-02 12:03:17 +02:00
Andre Hartmann
a9016b371a Android: Fix build with Qt 4.8
Change-Id: I28c96b1d02735c687be4d3626cce2395e710814b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-10-01 20:46:23 +02:00
Christian Kandeler
a54327dc25 Android: Fix build.
Change-Id: Ie4cb2e58e1abb7319b26ce166a039c9b3db47dd7
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-10-01 20:14:26 +02:00
Christian Kandeler
82c51aac4d Fix qbs build.
Change-Id: Id88e8967379a1236556d58a49739aae1c47665a8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-01 16:07:24 +02:00
Eskil Abrahamsen Blomfeldt
c8393b10fd Extra library editor for Android
Add a list view to the deployment settings which allows you
to add and remove libraries from the ANDROID_EXTRA_LIBS
variable in the .pro file.

Task-number: QTCREATORBUG-9849
Change-Id: Ic0131c46be8fdef4b226b5ceb0ee82ea4dd82c6a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-01 15:41:43 +02:00
Orgad Shaneh
7aa91c0bd8 Fix compilation with Qt < 5.2
Change-Id: I8e8b29246274e0b358dad9f5596a64639f0255c5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-01 13:24:33 +02:00
Daniel Teske
4c4cceaa49 Show potential kits in the targetsetuppage
Change-Id: I6569e3d53b78cdcdf8607a289b5be37447e0a03c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-01 12:44:39 +02:00
Daniel Teske
64c17eab22 Android: Qt 5.2 deployment add a button to create a Android manifest
The AndroidManifest.xml is no longer needed in as many use cases as
before. So the new deployment does not automatically create a
android manifest. Offer a button on the deployment page to create
a android manifest. This also edits the .pro file adding the
ANDROID_PACKAGE_SOURCE_DIR.

Change-Id: I2655dd6c96e2087732b4d7240b31fe9fcf168600
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-01 12:22:21 +02:00
Friedemann Kleint
86ff13b893 Fix compilation of the Android plugin with Qt 4.
Change-Id: I5f16e01754b84e024b33d9addee94352c69c8a25
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-09-27 09:41:03 +02:00
Daniel Teske
1262310798 Android: androiddeployqt support
Change-Id: I37d706b4e11c6e1353a8ee73378b7d080080678c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-09-26 17:13:27 +02:00
Friedemann Kleint
529cc963b5 Fix lupdate-warnings in AndroidDeviceDialog.
Change-Id: Iab0b2c963a0a75b7c0dc85af5a6c5e5222b6a61b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-25 18:58:42 +02:00
hjk
394045b218 Debugger: Export Debugger::DebuggerItem to fix BlackBerry setup
Task-number: QTCREATORBUG-10189
Change-Id: Icddd09a1a931371133a1d03ca8cf600e76295eac
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-25 14:45:04 +02:00
hjk
c4d1d7f278 Core: Clean up some ICore::instance() uses
Change-Id: I888b30094ed75818ee3af58c94ebf8468afa5eb9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-24 09:57:55 +02:00
BogDan Vatra
24eb1e8a7b Android: Fix OpenJDK 7 package sign.
Add "-digestalg SHA1 -sigalg MD5withRSA" to jarsign parameters as suggested by
https://code.google.com/p/android/issues/detail?id=19567

Change-Id: I0c809517d8cd3b1225b6a557f9f91227dbf42cf9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-20 16:59:58 +02:00
David Schulz
a06af35631 ProjectExplorer: Introduce DeviceProcessSignalOperation.
Every device can now return a DeviceProcessSignalOperation,
which allows to kill or interrupt processes running on the
device.

Change-Id: Idaa04ebc767e09ca167fa033ed93860b9b81479e
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-20 10:48:47 +02:00
hjk
ca15d0aa95 Apply static pattern to TextEditorSetting
Change-Id: I4e6f573d893c0aa2bb4ca9812fc8db2961dac172
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-20 10:28:22 +02:00
Daniel Teske
d744919b67 Android: Device selection dialog, fix error messages
Change-Id: Ie9d1535ae93ca0a28bf7f6ccd3ee73bcb783be4c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-17 18:25:41 +02:00