Commit Graph

1898 Commits

Author SHA1 Message Date
Daniel Teske
8bd2fe172c Android: Expand tooltip on Ministro
Task-number: QTCREATORBUG-11922
Change-Id: I0df746cc90b3613720a0ca14260ff86b37eb0a9a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-04-01 11:11:35 +02:00
Robert Loehning
5bc8e4d9fe Fix typo
Change-Id: I695e95dda92065ccc8c1385b4a1c3277b201f930
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-04-01 11:06:40 +02:00
Oswald Buddenhagen
f013c41d05 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
2014-03-27 18:20:00 +01:00
Daniel Teske
d484bf9b6f Android: Ensure that keytool outputs in english
Task-number: QTCREATORBUG-11417
Change-Id: Ie94e1b7c149feda9c25554b5eff5862498dda81d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-03-27 17:12:12 +01:00
Daniel Teske
53d36eba33 Android: Fix updateAutomaticKitList
Task-number: QTCREATORBUG-11877
Change-Id: I5fa4b4667c27a7b82addd7845dd504d4eb6108cf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-27 16:36:13 +01:00
Daniel Teske
d30393c2aa Android: Fix changing keystore not asking for the password
Task-number: QTCREATORBUG-11853
Change-Id: Ib63744207beb5e6d0d0bdb0647c99b27d80d8b71
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-03-26 16:52:56 +01:00
Daniel Teske
af8da5dfae Android: Create AVD: Show error messages
The check for errors was wrong and didn't even get the right string.
Fix that, and also use a QMessageBox for the errors.

Task-number: QTCREATORBUG-11729

Change-Id: I9aecd1dcbeabb35d60833419f7997ea4c704d65b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-03-25 12:22:15 +01:00
Daniel Teske
294465044c Android: Create AVD dialog, give messagebox the right parent
Change-Id: Ib4f65eb0b63fdcb03468d28bf6c65a50074182bb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-03-25 12:22:08 +01:00
Daniel Teske
3d8000a926 Android: Add Libraries: Disable library model while parse is in progress
Change-Id: I314e7db6178d6d6863b3f99a0bf1f0eec0956303
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-03-19 16:38:17 +01:00
Daniel Teske
c577906823 Android: Add Libraries: Open file dialog in project's directory
Change-Id: Id7a71f3c1f41f2d650e5f98b8bb35bfa5a68fd98
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-03-19 16:22:58 +01:00
Ulf Hermann
1111c06aac Android: notify qml profiler when app is stopped
As we cannot determine reliably what happened to the app we drop the
"success" parameter to notifyRemoteFinished(). It was almost always
true before and where it wasn't it didn't do anything useful. The
transition from AppRunning to AppKilled without AppDying in between
was invalid and would have triggered an assertion when it happened.

Task-number: QTCREATORBUG-11760
Change-Id: Iebf4ca9bddbcc7b152131f9574bc5f2c0a8ba44f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-19 12:29:49 +01:00
Friedemann Kleint
9c180ffded Improve translated messages in Android device dialog.
Reduce duplication, remove some HTML formatting.

Change-Id: Ia419a5c9a5bbeefca2863acd5d893f13acb34866
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-19 11:14:13 +01:00
Daniel Teske
41d3f0f2f2 AndroidSettingsDialog: Warn the user that spaces in the ndk path are bad
Task-number: QTCREATORBUG-11629
Change-Id: I576940fa5ac3fd47376cf3fc700689e1046387b0
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-18 17:11:01 +01:00
Daniel Teske
c751e2d685 AndroidSettingsDialog: Fix kitWarning icon showing up wrongly
Change-Id: I619c858d9a379ee8b1463c048a8c34950ac25bc7
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-18 17:10:56 +01:00
Oswald Buddenhagen
868428cc63 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
2014-03-18 14:46:29 +01:00
Christian Stenger
b7f20d3da4 Android: Fix compile with Qt4
Change-Id: I3f1589b7ef08d288ad8b60dec29757d0c5d95e46
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-18 14:24:04 +01:00
Daniel Teske
590c033b36 Android: Add a checkbox for "Default Qt module permissions"
Task-number: QTCREATORBUG-11528
Change-Id: Id4e7f8c0ca4b060c5accf5f6f3b1ab2071ca408e
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-03-18 13:26:13 +01:00
Daniel Teske
aec12ca069 AndroidDeviceDialog: Show a hint if we found no device
Task-number: QTCREATORBUG-11437
Change-Id: Ib08cd6c7fd60d9973eb4022a2519a30bd0570496
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-03-18 11:44:39 +01:00
Ulf Hermann
2fac0c5fbc Android: Try to parse the QML port from stderr
Most of the time the port is not announced on stdout but on stderr.

Change-Id: If72bb7f65dcfe7e697de2545d33e99ddb6363ecf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-17 10:34:42 +01:00
Ulf Hermann
0d3f7f0deb Android: Treat "fatal" messages error output
If you trigger a fatal signal e.g. dividing by 0, you'll get a message
with an "F/" prefix. That should be red, too, just like "E/" and "W/".

Change-Id: I8bef7ebf4e8c7d7ac3794750306073043852634b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-14 11:57:28 +01:00
Ulf Hermann
f9864efea7 Android: Properly split stderr into lines and drop unrelated messages
Change-Id: I860cddcea23692fd8c9b69b849e7b1fb50e9113d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-14 11:43:43 +01:00
Kimmo Leppälä
ffbb129f18 Fix deployment to Android virtual device
With the latest Android SDK Tools installed deployment to Android
Virtual Device failed since the format of "android list avd"
changed to include device tag information.

Task-number: QTCREATORBUG-11658
Change-Id: I72a2427dedfaf0cd7638b9805c545fda0bd6598e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Kimmo Leppälä <kimmo.leppala@digia.com>
2014-03-14 11:18:40 +01:00
Ulf Hermann
f5dc6bed45 Android: Don't read from adb logcat while PID isn't known
Otherwise we throw away important parts of the output.

Change-Id: I7ab6989c19660bcbb53d6ff61eda62878044ded2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-13 16:35:05 +01:00
Daniel Teske
e060086f5a Android: Don't let the user choose a stupid ANDROID_PACKAGE_SOURCE_DIR
On creating a AndroidManifest.xml we ask the user where to put the file,
which as a sideeffect also sets ANDROID_PACKAGE_DIR.

Since we copy everthing from ANDROID_PACKAGE_SOURCE_DIR into the build
directory, using the project's source directory is not desireable.

We now show a big error if the user tries that.

Task-number: QTCREATORBUG-11708
Change-Id: I7fade3efac0b7466cad8e83a92c2115d0a70c683
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-03-13 12:31:02 +01:00
Jarek Kobus
96a3fd53e8 Fix tooltips, add lacking dots
Change-Id: Id54a11b6868d5033fd1ecfd6324b7e50b94e305c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-13 12:06:27 +01:00
hjk
3b84a6dc88 Use ICore::dialogParent for message boxes without parent so far
Change-Id: I2ee35796b2c041e6ea2ae6bd677e10167451d1b8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-03-12 12:06:10 +01:00
Alessandro Portale
388dc9947a Android options: Stronger check for valid JDK location
The location should contain bin/javac

Change-Id: If67ed4902b817f2d07302afb195e6dfbad881250
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-12 11:17:26 +01:00
Daniel Teske
de8b860441 AndroidManifestEditor: Rewrite writing of xml files
Using QXmlStreamWriter + QXmlStreamReader gives us greater control
over the ordering of attributes. That way we can ensure that we never
change the ordering that the user used. (Whereas for QDom the best
we can do is to have a predictable but random order.)

Neither QXmlStreamWriter nor QDom allows us to control the indentation
and other whitespace, so any user indentation is lost.

In addtion QXmlStreamWriter seems to have several bugs with indentation
though, leading to rather strangely formatted files.

Task-number: QTCREATORBUG-10870

Change-Id: I4cdbdcd499227f418e7767eb1b532efbbd5083a5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-12 10:45:34 +01:00
Daniel Teske
e433b83f64 AndroidSettingsWidget::apply(): Fix order of applying the changes
Create the device first, as otherwise no kits are generated and
create toolchains next. This should fix that the AndroidPotentialKit
 doesn't vanish in some cases.

Change-Id: Ia9141f72a146da157dc713c1e2f293747fa369bd
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-11 15:40:22 +01:00
Joerg Bornemann
84df758ec6 use new base import style in qbs files
Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-03-11 14:20:22 +01:00
Oswald Buddenhagen
52bf71fbdf Merge remote-tracking branch 'origin/3.1'
Conflicts:
	README
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: Ib9aef37a246bc3bb9bca0c32a902af3b09ef3146
2014-03-11 13:39:55 +01:00
Daniel Teske
77d885bf3a Android: Handle offline state
Task-number: QTCREATORBUG-11056
Change-Id: I81b58d08b66b4fb8322e5c6c4935ddfb9470318f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-03-11 11:04:08 +01:00
Leena Miettinen
336a71fbee Android: fix capitalization and punctuation in UI text
Change-Id: I132e849264f4be6c5378ece9bbf95943d25b9f69
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-07 16:09:13 +01:00
hjk
6b358cbe37 Android: Copy less configuration data
Change-Id: I8f20addd45fae422f723047689d98e9d903cce6b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-07 14:05:39 +01:00
Eike Ziller
5dd8d7cd9c Editors: Move id() from editor to document.
Change-Id: Ib81076842ab1c16832224790194b001206404d64
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-05 16:27:52 +01:00
Alessandro Portale
3affbed2b6 Android: Fix parameters for the Ant script file dialog
Making sure that the file name field has "ant.bat" set, and
that the filtering really works.

This patch also ensures that native file separators are shown.

Task-Number: QTCREATORBUG-11628
Change-Id: Ibab8c145d0b832e5ad2e2ff62a81818e4044f13e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-05 12:41:57 +01:00
Alessandro Portale
c1b2ed036f Android: More accurate Android Sdk location error messages
If the user installs a fresh Android SDK and selects its path in
the Android options, Qt Creator will still say that this is not
a valid Android SDK.

The reason is that Qt Creator also checks for the platform tools
to be installed. Installing those is a separate step which needs
to be done after installing the SDK.

This patch enables Qt Creator to tell the user if the platform
tools are missing, but the SDK is otherwise fine.

Change-Id: I3557fb93d46e8677498843250302d12c8babb1df
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-05 12:18:31 +01:00
Sergio Ahumada
c375436847 Fix some typos
Change-Id: I3be73c2a4d256a0d28e863fd2517a4d7442b34d8
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-05 09:39:42 +01:00
Robert Loehning
8d238af564 Use native labels for "Browse" buttons
Change-Id: Idee0525ccd69c64856d0f4b7b3bab1252e573280
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-03 13:00:25 +01:00
Friedemann Kleint
028fe7f627 Remove leading newline characters from translated messages.
Change-Id: I237ad558e27a619f9162ebec2ef4ede9ed2cdeea
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-28 14:58:45 +01:00
Eike Ziller
4251265a63 Unify text on buttons that open the options dialog
We have many buttons that open the options dialog, and many of these use
different terms.

Change-Id: I073fe2a23569c6f4174a2fb6567359c89cb2427c
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-02-25 16:55:25 +01:00
Robert Loehning
03ead7f432 Add "..." to buttons which open a dialog
Change-Id: I70974a223b68b9823ac0f1346a9ecc504355955f
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-25 11:20:32 +01:00
hjk
6c6f47f86c Core: Make IEditor::id a value member and adjust users
Change-Id: I47e457c4a1821c515cd8a740d27bfe005a0c09e6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-25 10:36:25 +01:00
Alessandro Portale
5a0e1c8b43 SettingsWidgets: Put JDK path field to the first place
JDK should come first, because Android SDK depends on it. If a
user fills the form from top to bottom while installing the tools,
[s]he will have problems with the Android JDK entry because of two
reasons:

1) In order to launch the Android SDK Manager (in order to install
   the platform tools) Java is required.
2) On Windows the Android SDK now comes with an installer (unlike
   the .zip file on Linux/OSX) which enforces the JDK to already
   be installed beforehand.

Task-Number: QTCREATORBUG-11522
Change-Id: I533acca502625afce3708c8b303085819b153f29
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-02-21 12:32:27 +01:00
Eike Ziller
acd898bed2 Give Android potential kit a warning icon
And change the summary text to point out the issue.

Change-Id: I041438c5183a9ce2b0b1b89ed0f8032c7f26687f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-21 11:39:12 +01:00
Daniel Teske
1442c88338 Android: Fix initial setup
Broken in the settings dialog refactor

Change-Id: Ibb4777c36e332d9972048f4cd339e890518c523c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-20 15:13:04 +01:00
Daniel Teske
aaedccf116 Android: Fix debugger startup by trying harder to find the pid.
Task-number: QTBUG-36201

Change-Id: I8b4e1bd7615e4fda1184b0d3d443afcdc5e0e898
Reviewed-by: jian liang <jianliang79@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-20 14:27:36 +01:00
Eike Ziller
1abcf0fb0e Android: Add configure Android item to "Add kit" menu in projects mode
Change-Id: Icab9df511d0cab349aaeb9420ae437af36836733
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-20 12:53:08 +01:00
Robert Loehning
321a5614d8 Fix issues in AndroidDeployQtWidget
- Use PathChooser
- Fix setting of CheckBox
- Fix button labels

Change-Id: I7acde4161370ff4c3d9a91b1175f3a3681fdea55
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-19 17:28:47 +01:00
hjk
9cbee15341 PathChooser: Provide more direct access to button label
Change-Id: I1489f40432acd3b70cedac6aded40738dddca941
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-19 15:17:24 +01:00