Commit Graph

1898 Commits

Author SHA1 Message Date
Daniel Teske
78aa64e06b Android: Deploy libgnustl_shared.so directly from android-ndk
Task-number: QTCREATORBUG-8688

Change-Id: I890663c96d11a38275724b792eca0be782df673f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-04 14:56:45 +01:00
Daniel Teske
d2dff265ae Android: Fix removing of no longer valid kits
Changing the ndk directory will remove the toolchains. That means some
existing kits might be without a toolchain, we need to handle those too.

Change-Id: I02789550acc4dd16591a87c768c2bddecb4b6e80
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-01 13:38:35 +01:00
Tobias Hunger
519a365962 ToolChainKitInformation: Make use of ToolChainManager::isLoaded()
Warn when trying to access values not yet initialized, and avoid
doing so. Also invalidate toolchains in kits properly.

Change-Id: I3a98a2ca89ce43d9982d37bdee451c5122c788b2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-28 18:12:11 +01:00
Tobias Hunger
60cea5e162 DeviceKitInformation: Warn if something goes wrong
Change-Id: I23bb33a1415dd11e0dafc3d2b7dfa4e391fdcd87
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-28 18:12:03 +01:00
Oswald Buddenhagen
6bbdeec812 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/qnx/blackberrydeployconfiguration.cpp

Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d
2013-02-28 12:02:40 +01:00
Daniel Teske
15504d4db2 AndroidSettingsWidget: Start browsing for NDK/SDK at the current value
Change-Id: Ic1c5d6b015306108955a536845dd204dc8474a0d
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-02-28 11:37:18 +01:00
Eskil Abrahamsen Blomfeldt
e4ce44c018 Read ANDROID_TARGET_ARCH instead of CONFIG
Instead of adding single archs like x86 to the general CONFIG
variable, we can read the ANDROID_TARGET_ARCH directly in
Qt Creator.

Change-Id: Idc4c4524d0f277aad8e129ca622d64d505a5ac95
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-02-28 09:59:08 +01:00
Daniel Teske
fba4106311 Android: Mark toolchains from not the current ndk as invalid
And ensure that they are removed on changing the ndk directory.

Change-Id: Ifd3de4d2ac53e93c70b683e11c1368755969ccee
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-27 15:21:30 +01:00
Daniel Teske
28b0e9d3ea Android: Set the display name for automatic kits just before registering
The KitManager tries to make the name unique, thus we should wait with
the setDisplayName until we deregistered the old kits.

Change-Id: I299bff72665768febc8a3310790dd2511b1794ed
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-27 15:20:32 +01:00
Sergey Shambir
a128d38394 Android: select device with "adb -d" if it have invalid serial no
Works only if no correctly detected devices attached to adb.

Sometimes serial number becomes '????-????-????' on linux because udev
rules are not configured, handling them without configuring will be
useful.

Also i have 2 phones that have no serial number at all on stock rom.

Serial number disappears on some smartphones with CyanogenMod
http://forum.cyanogenmod.org/topic/64522-i-have-no-serial-number/

Change-Id: I1a992eb2537342934c60d79c9180edd955aa7862
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-02-26 22:44:57 +01:00
Daniel Teske
a807efec12 AndroidPlugin: Fix automatic creation of Kits being run to early
Task-number: QTCREATORBUG-8819
Change-Id: I2b78706ed7e090ed66ad412fb8600b0f73a7323e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-25 15:08:35 +01:00
BogDan Vatra
a93765c5d1 Don't crash when can't detect the qt abi.
Change-Id: I103d5199d608a166e15098a89d63f4f7cc1f5c21
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-25 11:22:39 +01:00
Daniel Teske
6afb941b86 Android: Do not try to update the kit list before having qt versions
This deletes all kits. AndroidPlugin::extensionsInitialized() is called
before QtSupport::extensionsInitialized() so, the qt versions aren't
restored yet at that point. The Qt Version Manager will though emit a
signal on restoring them.

Change-Id: Ibf39d6f73ad173f358de3d757d8cdd97c52eca41
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-02-25 11:19:31 +01:00
Friedemann Kleint
a223b3472a tr()-Fixes in QNX, Android.
Change-Id: I6c0675ae96bf1563c9c4dffa8f73bb18e65b93b3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-02-22 11:17:17 +01:00
Daniel Teske
4ae4f05f91 Android: Fix Abi of qt versions
Change-Id: I441e6e29305eb082a8d713ab9d26b7fce419a509
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-02-21 19:58:35 +01:00
Daniel Teske
979815e675 Android: Automatic Kit creation
If both qt versions and ndk path exist automatically create Kits

Change-Id: If7739e866eeda3df2982850ff8f8cf22ca8f22c0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-21 17:34:04 +01:00
Daniel Teske
82f8ba6581 Android: Fix path to android.xml
Change-Id: I646d6af6dbf8734ebaad643cb389a60d66061491
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-21 13:31:32 +01:00
BogDan Vatra
88ac76fb72 Add MIPS support for Android.
Change-Id: I6b533543a998e04b3496ce2eb480bc0ee14dcbb7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-20 09:32:14 +01:00
Robert Loehning
420eefd884 Compile fix
Change-Id: I2807efd386b86247a4fbf67151cd6d3fb98c3b22
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-18 16:22:42 +01:00
Eskil Abrahamsen Blomfeldt
a19ed6063a Fix Android plugin to support Qt 5 style rules-files
In Qt 5 we have modularized the rules files so that each module
specifies its own rules. This patch updates the plugin to support
reading from these in addition to the rules.xml of Qt 4 so that
it should work well for both.

The "replaces" attribute of the lib element is also added in Qt 5
because the files are generated and thus the approach of rules.xml
where replaces is a separate element and where the order has
semantics was not convenient. We of course support the
Necessitas approach as well.

Change-Id: Ife21903c9faf61e1791cf8c0ea78bb61c74dcb34
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2013-02-18 15:04:23 +01:00
BogDan Vatra
6f1509434f Remove unused vars
Change-Id: Ib2ae2c12009ffbb7d4cb56c50dfef97e4e6c0ade
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-18 14:34:30 +01:00
BogDan Vatra
93447239d3 Fix Android X86ToolsPrefix
Change-Id: I4db2261625c6fbc87d1a19218ea0a095cee9986e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-18 14:34:11 +01:00
Oswald Buddenhagen
1ffe15a471 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I84145b02bf4f80848c0c1d762de34738f08bb78f
2013-02-18 14:16:53 +01:00
Daniel Teske
8d15776839 AndroidGdbServerKitInformation: Don't crash without a toolchain
Change-Id: I9d74c0725cb7c4e7cd205b931040479dae494164
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-14 17:32:48 +01:00
Leena Miettinen
643263ff26 UI text: fix Android strings
Fix capitalization in messages and UI text.

Change-Id: I09fd826566f756cf2afaa4e29f93572089b9a8aa
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-13 12:17:12 +01:00
Joerg Bornemann
ab1634d3c3 fix android.qbs
Change-Id: Ib71bee40ccf84b2fa83d5d0bc086262298f9039c
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-02-13 10:34:43 +01:00
Daniel Teske
af820b73c7 DebuggerKitInformation: Use Eliding Label
The path to the debugger and gsbserver can get long. This prevents
scrollbars in those cases.

Change-Id: Ic8c22d764ce9d5d798ea3c8d2a9f638d51a30351
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-11 11:46:09 +01:00
Daniel Teske
9657c06507 Clean up slot list in androidsettingswidget.ui
Change-Id: I42bb8b78391dee33398924af1bb8c74e3b5e5c60
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-02-07 19:21:27 +01:00
Daniel Teske
4a890f6d47 Simplify Android settings, move debugger/gdbserver to Kit
Creator now realiable creates one toolchain for each toolchain found in
the ndk. This no longer depends on any qt versions being present.

Also the gdb command and gdb server command are moved to the Kit and are
no longer found in the Android Options page. Both settings can be
autodetected from the Kit options page. Note that this might break
existing android kits.

Change-Id: I1dce084f2bb372e615e19b1c9e3a1e205b5d9647
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-02-07 19:21:20 +01:00
Christian Kandeler
45fd1c248f Remove unneeded #ifdefs.
Change-Id: I66241be77f61a53590b72560fc0afce50bda97d9
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-02-04 14:24:16 +01:00
BogDan Vatra
1ee3db88e3 Revert "Android: also adb pull /system/bin/linker"
It breaks the debugging on real devices.
Tested on HTC Desire HD and HTC Amaze.

This reverts commit 6fc9c0732b.

Change-Id: I378af345b186e1b4eef9997d3d8e592c43c3f1c4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-04 11:27:20 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Daniel Teske
339b7ba203 Android: Fix title of dialog
Change-Id: I0f1b46ffb621384663a2fa3a76f70ec04ddfa717
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-30 11:40:02 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Daniel Teske
dc40099d0b Android: Make local deployment smart
On deploying, first check the timestamps of the files on the device,
and then only copy+strip+deploy the files that are newer.
Add a button for cleaning /data/local/tmp/qt as that is no longer
done on each deployment.

Task-number: QTCREATORBUG-8538
Change-Id: I93c4e6266d7d748b0a4735e00806282315227d4b
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-24 15:07:07 +01:00
Christian Kandeler
0cf4f0885b Adapt qbs project files to new installation approach.
This need a qbs build >= commit 5cdf94de to work properly.

Change-Id: If86aedf9e3f9d01ad1202e03221e49698d517666
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-01-24 13:02:32 +01:00
BogDan Vatra
b57e37243d Fix AndroidRunner stop action.
When the stop button was pressed nothing happened

Change-Id: I58a05aa3a4ea990595298cde0a330b382b65b035
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-24 12:20:30 +01:00
Ray Donnelly
6fc9c0732b Android: also adb pull /system/bin/linker
This is so that gdb can find the address of rtld_db_dlactivity
 to enable breakpoints pending on shared libraries to be set.

Several fixes were needed so this can be used both in Jellybean
 as well as older versions of Android. Credit for these
 improvements goes to Ryan Bissell:

  https://android-review.googlesource.com/#/c/39180/
  https://android-review.googlesource.com/#/c/42611/
  https://android-review.googlesource.com/#/c/42612/

Change-Id: Ibfb6335ab256df58b407e1661e1f04070fc3ecb6
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-24 12:05:13 +01:00
Tobias Hunger
5e197c8c9d Options Dialog: Move Android, Blackberry and Devices together
Change-Id: Ie91735bc4f9d0c6b84ff7347538906290473e07e
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-23 17:59:11 +01:00
BogDan Vatra
57738988f2 Remove useless warning dialog.
Redirect the errors to the application output window.

Change-Id: I927fae72a53314d0200ffbd13c68900d15259cf9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-21 11:25:08 +01:00
Eskil Abrahamsen Blomfeldt
51273ab864 Deploy Qt Quick 2 imports to device as well
Qt Quick 2 imports are installed to $QTDIR/qml instead of
$QTDIR/imports. We have to make sure they are available
on the device in order to use Qt Quick.

Change-Id: Iaa3e429f6706a5e200d5a1672b63059ddf39e770
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-01-18 15:52:29 +01:00
BogDan Vatra
9a536061cc android.xml is a settings file writtent by the SDK Installer
Change-Id: If774202bff59f4f779b60c1a558ffd219a76fc1e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-17 12:13:46 +01:00
BogDan Vatra
ac3831d3ca Set env vars every time.
Change-Id: I1196929031bd754dcbb7a52799dbb2d1b67df776
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-17 12:13:28 +01:00
BogDan Vatra
be2176f1de Use /data/local/tmp instead of /data/local to deploy local libs
Change-Id: Id55c1570222daf2bd04ae1cded4ab53f0cdfbca4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-17 12:12:28 +01:00
BogDan Vatra
674ec5efa9 Send static_init_classes paratemer to Android application
Change-Id: I3eba3413464bd0e503f24817769bd3062be0eeb2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-17 12:11:22 +01:00
BogDan Vatra
2112e1e5dc Prepare Android plugin for release
The icon is taken from Android SDK.
It is licensed under Apache 2 license.

Change-Id: I888922c9530a1fe800edd01f8b8bf4c4d0a61d74
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-17 12:06:00 +01:00
BogDan Vatra
cca1e95308 Fix windows parse readelf output
Change-Id: I863b028397f8e6a57a989c1715fa601848b96b41
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-17 12:05:20 +01:00
hjk
be48a3faff Use Core::Id for IOptionsPage::m_id
Change-Id: Id9d6cf28966eeb65775cf1f16f57773af5fb6bca
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-01-17 11:43:04 +01:00
Oswald Buddenhagen
65c169c80e Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidrunner.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6
2013-01-16 16:46:03 +01:00
Orgad Shaneh
88267a3299 Generalize QT_NO_CAST_FROM_ASCII
Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-16 01:14:08 +01:00