Commit Graph

1898 Commits

Author SHA1 Message Date
Christian Kandeler
2a3ef09473 Device support: Make IDevice::executeAction non-const.
Presumably this function is currently const because no current
implementation actually changes device properties, but there
is no reason why that should not be allowed.

Change-Id: I80e4355be70e40bca9df5e1287a1d1d3f60c6534
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-17 13:36:08 +02:00
Tobias Hunger
d7674e45c2 KitInformation: Delete subwidgets in destructor
Change-Id: I7e0a6d457aa26748758b6402955c81eae2c94782
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-17 10:13:26 +02:00
Christian Kandeler
f4dc469fe1 Android: Fix build with namespaced Qt.
Change-Id: Ie888c2f02e20e866f19854ab621a87e01569b0d5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-13 14:17:56 +02:00
Daniel Teske
3bb7339fd4 Android: Implement device selection dialog
Change-Id: I1f4f3065a09837414429bbfc68110ada85ea174a
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-09-13 12:34:46 +02:00
Tobias Hunger
f1f1f65f7c Kits: Simplify handling of sticky kit information
Change-Id: Iff01445d1251487bd44c227de36f1b47ba4c3d42
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-12 18:46:20 +02:00
Daniel Teske
a3a20c5697 Android: Fix unnecessary warnings from qt about .arg
Change-Id: I780dcf3ebd174275389620319e2d4b4784c84346
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-09-11 10:43:47 +02:00
Orgad Shaneh
bc7778a31d Utils: Introduce sleep function
Use it in Android plugin

Change-Id: Id3ae707d5425e99a2e5b993e1ed98dddd73809a9
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-09 15:52:49 +02:00
hjk
ad58c2bb44 BuildManager: apply 'static' pattern
Change-Id: I00bb591c027a22088d5f1feedc84aa28523dcca2
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-05 15:37:43 +02:00
hjk
0126672336 Compile fix with Qt 4
Change-Id: Iae87c5c9c19de1bf7fc5e4d354f96f0365315324
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-05 13:12:36 +02:00
hjk
527046acc2 MessageManager: General cleanup.
Apply 'static' pattern, rename 'printToOutputPane' to 'write'

Change-Id: I6f31f1a8c914661e2a2182c0b6256b41ead28de7
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-05 12:51:00 +02:00
hjk
aadb6f16af SessionManager: Apply 'static' pattern
Change-Id: I370f72fcf7a24216ee189979ce6b5c8bfc5f4140
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-05 12:28:12 +02:00
Daniel Teske
dab9886ebf Android: Make ant less verbose
Change-Id: Idfd2510f2711be27219676bb843ab6e32b84c8e2
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-09-05 11:37:42 +02:00
hjk
cd17a0e400 Debugger: Don't add invalid items during validation
Change-Id: I3b6427ec038d61ea3166880ae51292f87f7b861b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-05 10:52:51 +02:00
Friedemann Kleint
dc108bc31f Replace QObject::tr() by tr-functions.
Change-Id: I2e3867b682db971662250c04dec609fd4e3817ea
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-04 16:30:42 +02:00
Daniel Teske
b14a0e58e6 Android: Make sign package orthogonal to the debug vs release
This enables signing debug packages and creating unsigned release
packages.

Task-number: QTCREATORBUG-10060
Change-Id: I57d094972b451538e8e9e5104e803e50a4ba2336
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-09-04 11:21:54 +02:00
Nikolai Kosjar
69fc3cf03f Kill ";;" at end of statement
Change-Id: I177094f19978e07f85e42b34701d8f03cd26665e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-09-04 09:19:10 +02:00
Tobias Hunger
a82654a485 Android: Remove some Android namespace usages
Change-Id: I74df950ff9de6ddc639a4b32bec55c269b5fb0e1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-03 16:18:26 +02:00
Daniel Teske
f214011d33 Kit: makeSticky() -> setSticky(), allows for unsetting sticky bit
Change-Id: I6aa7d7d52b681ee61d27c2d98e6fefe9cfd9532b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-03 12:18:29 +02:00
hjk
a37589d431 Apply 'static' pattern to MimeDatabase
Also adjust and streamline using and surrounding code.

Change-Id: I6a8b05126bdcbb74ff611b21c7cb3c5902a2d5ca
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-03 11:41:45 +02:00
Friedemann Kleint
1226400af3 Introduce an enumeration for toolchain autodetection.
Replace boolean "autodetect" by an enumeration with a value
AutoDetectionFromSettings indicating whether the Autodetection
originates from a settings file. Enable the "Remove" button for
those cases.

Currently, there is no way to remove toolchains that were once
autodetected and are no longer present. This happens for example
when working in different MinGW environments, which then
clutter up the toolchain options page and dramatically slow
down the options page opening since gcc is launched to query
the flags, etc.

Change-Id: I731168d8694fe56f60d909f9779f83cffa55fd44
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-03 11:32:33 +02:00
Christian Kandeler
72d173829c Remove superfluous include paths from project files.
A lot of our build system files specify unneeded include
paths. These roughly fall into the following categories:
    a) Paths that are already set in more general files
       such as qtcreator.pri.
    b) Paths that serve no purpose at all, possibly
       left over from earlier versions of the project.
    c) Paths that act as workarounds for wrong include
       statements of the form '#include "xyz.h"', where
       xyz.h is not in the same directory as the including
      file.
This patch removes such path specifications and fixes the offending
include statements from case c).
Tested on Linux, Windows and OSX with qmake and qbs.

Change-Id: I039a8449f8a65df0d616b4c08081145c18ae4b15
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-02 17:28:17 +02:00
Friedemann Kleint
489639fadb Fix warning about unused variable in AndroidToolchain.
Change-Id: I7759fc9b069015d5559b014a84ed01e50471746e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-02 16:09:15 +02:00
Christian Strømme
ba1d8e2c4d Android: Improve the Keystore and Certificate dialog.
- Display all information in one place.
- Checkbox to enable the certificate to use the same password as the
  Keystore.
- Display information when alias field is empty.
- Misc. layout changes.

Task-number: QTCREATORBUG-10061
Change-Id: I99a3e7019dfbf72bcd2374594f3ebe45c26680d2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-09-02 12:13:07 +02:00
Christian Strømme
e90633a8fa Android: Don't create a certificate if the alias field is empty.
We need to make sure that the user fills in the alias field before we
generate the certificate. If the certificate does not have an alias,
the package creation step will only create debug packages.

Task-number: QTCREATORBUG-10050
Change-Id: I247c7218a55ec86bdb1408c90f7f403b2ebbe2a4
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-02 12:12:49 +02:00
Daniel Teske
0aae98fb13 Android: Only create Kits for the newest toolchains
It's rare that users will want older toolchains.
In updateAutomaticKits distinguish between a Kit being removed since
the toolchain doesn't exist anymore. Which happens on e.g. changing
the ndk path. If the toolchain still exists, then it isn't the
newest anymore, so demote the Kit to a manual kit thus enabling the
user to remove it if he no longer needs it.

Change-Id: I59203abc9bed5f2c46a002cea68fd72a84283840
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-02 11:37:05 +02:00
Daniel Teske
7f6265f62f Android: Ensure that our autodetected kits stay sticky
Change-Id: Id62c9ffb875f5bb9e19b04d477d85726c2503964
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-02 10:40:19 +02:00
Christian Kandeler
c0372cbb4c Fix qbs build without qbs submodule.
"Properties" semantics strike again.

Change-Id: Ie07574ae709ad323265dec59dba53451820e1c96
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-08-30 14:56:57 +02:00
Daniel Teske
6c582e0180 Android Manifest Editor: Show available targets in combobox
Task-number: QTCREATORBUG-9682
Change-Id: I0454d96ff0a1df370e0b9197ae536bf5ae632ac2
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-08-30 12:05:04 +02:00
hjk
0ed9b97a1f QtVersionManager et al: Code cosmetics
Apply static 'pattern' for QtVersionManager, de-noise using code.

Change-Id: Id66ac90094cd7312d1e72abbdbce4c02b078456e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 10:54:16 +02:00
Paul Olav Tvete
db78293e7f Generic Android error messages
We want to give better feedback for installation problems and
other issues. There may still be undiscovered ways to mess up the
creator configuration, and we might find them after the string
freeze.

This adds a number of strings that we can use later.
We can add new error codes after the string freeze (and even in
patch releases). This means that even if we can't give people
detailed help for their problem in the UI, at least we give them
a googleable string.

We can then add better messages for the new errors in the next minor
release.

Change-Id: Ida7921fce5142d55144b0ba022de04726872187a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-29 17:07:32 +02:00
hjk
e4b2947c6f ProjectExplorer et al: Code cosmetics
Apply static 'pattern' for ToolChainManager, de-noise using code.

Change-Id: I196dc6f39dc2c61b1783aecad3faa0b23849e00a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-29 16:45:25 +02:00
hjk
c10ae974eb KitInformation: Make dataId and priority value members
More in line with recent development.

Change-Id: I38ad7dd0cb96080a9dc9cc3165e4fb7c78a736b3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-29 16:26:02 +02:00
hjk
36227d5c3a ProjectExplorer: Introduce per-kit debugger configuration page
Change-Id: I65c76f3ff43e1479075926c7e3fa460cca74d8fe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-29 16:12:08 +02:00
Friedemann Kleint
e86ef45aaa Fix compilation with Qt 4.
Change-Id: I9217eb6695b9e48579f66b7fd8709c84806ffb66
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-28 16:08:02 +02:00
Daniel Teske
31fe6f069c Android: Use minimum sdk instead of build target sdk to filter devices
Task-number: QTCREATORBUG-9662
Change-Id: I3a5b3493bc8ef48bd23d014e86eef45185f3c17e
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-28 16:05:44 +02:00
Daniel Teske
307aa7b3aa Rename AndroidManager::targetSDK to buildTargetSDK
There are 3 different sdk settings:
- The minimum sdk setting from the AndroidManifest.xml
- The target sdk setting from the AndroidManifest.xml
- The target sdk setting from the project.properties file

The last one is now called buildTargetSDK, since it only affects the
build.

Change-Id: I373d925a45088ff0cf8a8e0b22cf9744e571eeb1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-28 16:05:35 +02:00
Daniel Teske
3c2facab5f Android Manifest Editor: Add support for minimum and target sdk settings
Task-number: QTCREATORBUG-9692

Change-Id: Ide85392d86e7f3df4df9644f01d186ed939f5124
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-28 15:06:25 +02:00
Daniel Teske
211e56b5b7 Android: Detect "unauthorized" devices.
For now just show that in the compile output.

Change-Id: I332a8cae5653155175abfb1a4877ca1ca7cce8d5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-28 15:00:45 +02:00
Daniel Teske
de1af231e9 Compile
Change-Id: I39c69bace0926e381b3569818401ddda8dd2c986
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-28 15:00:29 +02:00
Daniel Teske
1c633eb1e9 Android: Connected devices should list all devices
E. g. waitForAvd needs all devices to correctly work.

Change-Id: I1b704e85bd7449d4c45ed36be48973f39148b8c4
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-28 14:54:56 +02:00
Daniel Teske
9d0ae5beee AndroidQtVersion: Call base class parseMkSpec
Change-Id: I8c9ca6cc61b49e5f5a437b95ac63a90ac0ee7667
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-28 14:45:01 +02:00
hjk
7e09b90723 Android: De-noise androidconfigurations.cpp
Change-Id: Iba945476c4534c2901232f22b4510d023b929ebd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-26 13:09:07 +02:00
Friedemann Kleint
54d2d6ba3e Android: Fix capitalization of abbreviations.
Change-Id: Id293954706b7a510d68dd7710bd11c3b7dbcf9e9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-26 13:07:13 +02:00
Tobias Hunger
1b4b6ed6ca Kit: Use FileName for icon path
Change-Id: Ica6cf20c4ae1c7d58386d4970e468a105a3263b3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-23 10:18:55 +02:00
Oswald Buddenhagen
417b80c544 make the android => qbs dependency optional
as qbs itself is optional

Change-Id: I1ff2d2f785ca206b379b305e783b9914081712b4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-08-21 17:29:55 +02:00
Tobias Hunger
95859289b8 KitManager: Use static API as other singletons do
Change-Id: Ia49c6552a5aae72870687ef9c64f2642fbe24155
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-21 16:55:16 +02:00
Oswald Buddenhagen
c2e90c360b Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/projectexplorer/customtoolchain.cpp
	src/plugins/vcsbase/command.cpp

Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
2013-08-21 14:39:18 +02:00
Tobias Hunger
3aa37f2e07 Android: Do not use #warning
Change-Id: I3981d60f5f38c4a738250f43336f981b844dc4a6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-20 15:00:41 +02:00
Tobias Hunger
f5224a6db6 Task: Add a new Task category for deployment issues
These are not build system issues and deserve their own category.

This has the side effect of avoiding them to get cleared when e.g.
reparsing Qbs files.

Change-Id: Ib949504533f7f15a560796bea91cae329f19a20b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-20 12:19:42 +02:00
Tobias Hunger
4eccb04eaa Android: Fix warning about ! being applied to left side only
Change-Id: Ic48e4efb4992f1724ff150c2686e3e99c39dbd97
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-19 16:36:37 +02:00