Commit Graph

1898 Commits

Author SHA1 Message Date
BogDan Vatra
24b14fa2b4 Export android specific settings to QBS
Change-Id: I3640272dc027047a1d27a2b55329c9f5093e8f1f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-19 15:29:05 +02:00
Daniel Teske
480f7c09fc Android virtual devices: Fix starting a avd
This cleans up various bits of the avd support in Creator.
- Adds a abi combobox to the create avd dialog.
- Moves the startAvd code into a separate thread, so that
  starting a avd while deploying doesn't block creator anymore.
- Implements a better waitForAvd function that works even
  if a emulator is already running and accurately can
  detect that it has finished booting.

Note: There are still many problems in the avd support in creator.
- The "clean libs on device" and "install qasi" functionality block
  the gui thread if they are run on a avd.
- If no avd exists and no suitable hardware is attached, the user gets
  a create Avd dialog, which doesn't tell him why he needs to create a
  avd. That information is hidden in the compile output.

Still this fixes the main use case of hitting run on a newly created
project with no actual device attached.

Change-Id: I76b3fdb1bdf3eadac07f82ad7d145ce6af453326
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-08-19 12:58:49 +02:00
Christian Kandeler
6d68422026 Utils: Introduce new class OsSpecificAspects.
This is basically a generalization of HostOsInfo for
a system that might not be the host system. HostOsInfo
is now implemented in terms of the new class.
Prospective use case: Untie Utils::Environment from
the host system.

Change-Id: If333b96674652109fcb0ad79f75aaaf5e86e17e3
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-16 08:05:41 +02:00
hjk
d3c299cbe3 ProjectExplorer: Streamline ToolchainFactory interface
Change-Id: I70dba496c4d1eeb9c6767080d179f86f20c1b107
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-12 16:14:06 +02:00
Daniel Teske
9e10b05366 Android: Ensure that keytool returns english output
Task-number: QTCREATORBUG-9941
Change-Id: I69c3f6aecdf5e4c40934b5151518a0787b752356
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-12 12:44:29 +02:00
Daniel Teske
2d4afd0494 Android: Clean up before packaging, be a little bit more careful.
The android/libs folder contains both the library from the project and
libraries from qt. This adds a small check before removing libQt5*.so,
that checks if that file is in qt's lib folder. That fixes the bug
below, but e.g. naming your project Qt5Test won't work.
Long term we'll need to overhaul the packaging and make that more
robust.

Task-number: QTCREATORBUG-9895
Change-Id: I48f735114ee95668a862549cfe1537aeab968dfb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-12 11:41:35 +02:00
David McFarland
d16706fc13 Use install path instead of source for android deployment
Change-Id: Ibb63b6077054b75566c6daac722f32f106b5049b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-08 15:17:24 +02:00
Aurindam Jana
904dd68e5f QmlProfiler: Remove StartQmlRemote start mode
Change-Id: I7a4ef54a02fcc8dedb28e843a2f05d737324a877
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-05 15:33:48 +02:00
hjk
835ef9507b Analyzer: Use the run mode stored in the parameters instead of a copy
Change-Id: I045622efa22bfcb26f9161556ccbbfb3df08599d
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-05 15:10:47 +02:00
hjk
62af817175 Analyzer: Remove some unused code
Change-Id: Ifa1468e357cae873df6a34380957100521317471
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-05 09:51:17 +02:00
hjk
213cb601af Analyzer: Use AnalyzerManager for run control creation
Less code.

Change-Id: Ic26d291ada7efd05899623738d89c52b4175716c
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-05 09:50:08 +02:00
Daniel Teske
2654141511 Android Kits: Use ANDROID_TARGET_ARCH in display name
Note this only affects newly generated kits.

Task-number: QTCREATORBUG-9865
Change-Id: I9f62c1d1932aa32e1a307b92ce0f8ba80bb6ed5c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-02 12:55:14 +02:00
Daniel Teske
b2a048b02f Android: Hide warning icon for sdk if the setting is empty
Change-Id: Idf86cbf8679afcd6054c1f191619a44b576c6f45
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-02 12:55:06 +02:00
hjk
b772001c82 EditorFactory: Replace some virtual functions with data members
Change-Id: I014cb57460c4e3a36bf7403960908b5ffec867ff
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-08-02 10:21:15 +02:00
Daniel Teske
87507893e8 Android: Make automatic kits sticky. We don't want the user changing them
Change-Id: I5e4a1a2441765a002097492c7ac71fb07c91b442
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-01 15:05:07 +02:00
hjk
baed8a12ff Analyzer: Remove unused AnalyzerStartParameter::toolId member
Change-Id: I34e713ec1c9de99584ba206cfa1e38cd46e880fc
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-01 13:18:54 +02:00
hjk
3de45d8c55 Analyzer: Merge IAnalyzerEngine and AnalyzerRunControl
Change-Id: I74edaef59600a44924d2692c1ebc7f98d8581115
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-08-01 10:33:01 +02:00
Oswald Buddenhagen
6896546ba5 Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/cpptools/cppmodelmanager.cpp

Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a
2013-07-25 13:18:31 +02:00
Aurindam Jana
1dd9a54ab6 AndroidSettingsWidget: Set JDK path
Use QFileDialog::getExistingDirectory instead of
QFileDialog::getOpenfileName.

Change-Id: I3790f3c238434643fa304e18a42216b951a445c7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-25 12:24:44 +02:00
Tobias Hunger
4e3c7b9835 Kit: Provide interface to mark individual kit information sticky
Change-Id: Ic45aae21cb8b0f4e4fdd0dcf1009f127e489920c
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-25 12:15:16 +02:00
Christian Kandeler
0e97084e72 Fix qbs build.
Android and RemoteLinux now depend on libQmlDebug.

Change-Id: I87f9ccc85daf0d096c4387b21642bb3b14fd03d6
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-07-24 11:04:09 +02:00
Aurindam Jana
09b301860b AndroidAnalyzeSupport: Set start mode depending upon run mode
Change-Id: I8f68a3cf683f4583af89d58366bac8b10e925325
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-07-23 16:22:32 +02:00
Aurindam Jana
510a7e8ad5 AndroidAnalyzeSupport: Change local includes to global includes
Change-Id: Ibfa0e7bc3b01efd5d4e2866cdbea5a6c3428fd9b
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-07-23 16:22:13 +02:00
Aurindam Jana
9cf063f4b5 AndroidAnalyzeSupport: Notify engine when remote is running
Change-Id: Ia04d7b16d4486be60114c148d118d6c9cb0d583f
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-07-23 16:20:52 +02:00
Friedemann Kleint
38a44f7e0f Android: Fix capitalization in message.
Change-Id: I8ec555982b9b8b6f30e32e20307c7c440b07a2a8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-16 10:46:30 +02:00
Eike Ziller
624d9e2c4c Move IEditor::isTemporary to IDocument
It's a property of the document implementation, not of the specific
editor instance working on it.

Change-Id: I5c3dd054e21b646e2d94b891916a096d045923f8
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-12 16:43:54 +02:00
Eike Ziller
cc7c3c9623 Add QTCREATOR_COMPAT_VERSION
Necessary for keeping compatibility within a minor series.
When bumping versions, the compatVersion now needs to be taken into
account too.

Change-Id: I588947f885480889ff2f58481f72db76e3f1a9f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 15:14:10 +02:00
Eike Ziller
dd43d9908f Rename IDocument::fileName --> filePath
That is what it actually is, wrt how Qt API calls it.

Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 13:51:42 +02:00
Daniel Teske
65c2930c06 Android: JDK location is a directory, use correct file chooser dialog
Task-number: QTCREATORBUG-9706
Change-Id: I0a1892eb94024529cf450926dee22e629ef85e0b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-07-09 12:00:08 +02:00
Nikita Baryshnikov
7da5e1635d AndroidDeployStep: remove unused strings
m_QASIPackagePath and m_runQASIPackagePath are not used anymore, so
could be deleted

Change-Id: I48d2f1531277c07be630c3156f04a40248da5271
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-09 11:58:50 +02:00
Daniel Teske
47f683f45e Android Create AVD Dialog: Simpler code
Change-Id: I953ff641f46caedc47551298dd1fedb62008ee92
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-08 19:32:00 +02:00
Daniel Teske
4b9fa4f004 Android Avd Dialog: Target not Kit
Global search and replace mistake

Change-Id: I2213fe591912faff4168f0cba6dccb2675aed794
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-08 19:31:52 +02:00
Daniel Teske
cc7fe5eac6 Project: Simplfy file adding/removing interface
The filetype is only relevant for Qt4 projects. But even for Qt4 projects
the file type is insufficient to decide where the file should be added.
So remove the file type from the interface and let the projectmanagers
themselves figure out what they want to do.

Also fix
Task-number: QTCREATORBUG-9688

Change-Id: I02f7b1cd2e05efaf76e36fb9af34b109d4482f88
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 17:05:04 +02:00
Eike Ziller
a98fe15fe5 Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
	qbs/pluginspec/pluginspec.qbs

Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9
2013-07-08 15:01:17 +02:00
Daniel Teske
5948bcf328 AndroidSettingsWidget: Don't show a message box for wrong settings
I believe this is responsible for the crash reported in
Task-number: QTCREATORBUG-9724

Change-Id: Id5721e46b9dc9587ff8423cd3d5e6aa9107e7dba
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-08 11:48:23 +02:00
Daniel Teske
7517a3408a Android: Show more information in the compile output for devices
Task-number: QTCREATORBUG-9690
Change-Id: I9b3e20db9049edc42364b005a7920a040f3feaf7
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-08 11:47:02 +02:00
Daniel Teske
6773d47a63 AndroidDeviceInfo: Rename cpuABI to cpuAbi
Coding style.

Change-Id: I433b4d47f54c5a3a9aed68d99b2ab64a7e82d698
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-04 13:05:29 +02:00
Daniel Teske
7449297dc4 Android: Remove apiLevel parameter from connectedDevices
Both callers do filtering on the api level afterwards, so it pratically
serves no purpose.

Change-Id: I8f54f9050a66185a3799ea5b5446dec935d2d5ac
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-07-04 12:27:53 +02:00
Daniel Teske
16908f5733 Android: Make getDeployDeviceSerialNumber not start a avd automatically
This allows the caller to do that as a fallback.

Change-Id: Ifd50036317c7df4fe77fc34ea0f616c07611a517
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-07-04 12:27:41 +02:00
Eike Ziller
8685ff8a28 Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I5d2018d3437b99bcdffa92bf1a212f42923c4fad
2013-07-03 16:55:27 +02:00
Eike Ziller
b05603a44d Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
	qtcreator.pri

Change-Id: I6726277830ddbd3b21391b5c5e48880929a2d725
2013-07-03 16:53:25 +02:00
Eike Ziller
c9128b7fdd Merge remote-tracking branch 'origin/2.8'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I1aa7506519e0f461f33921ca20ce1b51adb5783f
2013-06-27 14:24:57 +02:00
Daniel Teske
ea5aa79dca AndroidPackageCreationStep: Ensure right thread for handleOutput()
The ::run method is run in a separate thread, yet the owner of the
buildstep is the gui thread. As such we need to use a DirectConnection
to ensure that the slot is called in the right thread.

Task-number: QTCREATORBUG-9660
Change-Id: Ia206f3256a23f70f50d31c739359ff24b952fe46
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-06-27 11:17:45 +02:00
Daniel Teske
4174246b69 Android: Set ANDROID_HOME environment variable
Task-number: QTCREATORBUG-9424

Change-Id: Iba4a9663a8fa39160f1953366ae4aa64d5f586ea
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-06-26 13:38:45 +02:00
Eike Ziller
e8469a2bab Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: I8101f18b87859924644471817d4f1408790d5628
2013-06-25 10:14:14 +02:00
Eike Ziller
c59ba462ad Merge remote-tracking branch 'origin/2.7' into 2.8 2013-06-25 09:52:11 +02:00
Daniel Teske
bfa0bad74c AndroidRunner: Fix CheckPidTimer to not fire forever
- Only start the timer after we are sure that the app is running.
- Stop the timer if we detect that the app was closed.

Task-number: QTCREATORBUG-9545
Change-Id: I7d08b759d3aa5baaa3f82ee09aefb17e7c5fb512
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-18 11:59:52 +02:00
Daniel Teske
583cd11371 Android: Hide bundle qt option for Qt4
Task-number: QTCREATORBUG-9408

Change-Id: Ie86deea4b453d3ab3ebcf359c3e0b321a2cba33e
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-06-17 12:14:14 +02:00
Eike Ziller
afe1d5ee65 Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/coreplugin/documentmanager.cpp

Change-Id: I6dc025bc0f31eb694c8d9e2dd4ea5cc888ee8a94
2013-06-14 16:21:04 +02:00
Eike Ziller
42c9c96361 Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
	src/plugins/qmlprofiler/qmlprofilerengine.cpp

Change-Id: Ic9dc22d2d4a7306cfc4ef0ec158993e3768a9853
2013-06-14 16:19:14 +02:00