Instead compare the toolchain version (and abi) and replace the old
toolchain with the new toolchain.
This requires splitting up the updating into two parts, registering
the new toolchains first, then updating the kits and last removing
old toolchains.
Change-Id: Ida6aa27e84f683ef7a3159b69bb12f93cee4ec67
Task-number: QTCREATORBUG-14243
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Easy to do and makes the dialog feel marginally nicer.
Task-number: QTCREATORBUG-13123
Change-Id: I64098f1fd751100d40227c298a9e7eb358552bfb
Reviewed-by: BogDan Vatra <bogdan@kde.org>
They work too, we just need to parse which api level they have.
Change-Id: I8f9da57f738d142a849ca41cb678bed6abaefd17
Task-number: QTCREATORBUG-13980
Reviewed-by: BogDan Vatra <bogdan@kde.org>
And make that the default. SdCards are not that useful, so
creating one by default is odd.
Change-Id: Iddb34e9e3387c9c4488f7b2bc11799cfc28c9a43
Task-number: QTCREATORBUG-13590
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
At some cases, android.bat on Windows running longer.
Change-Id: I53ae90e4d7fea69b603cf8cca8c1f8ee5aa36a6a
Task-number: QTCREATORBUG-14223
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
New %{Debugger:Name} for global use, %{Debugger:{Type,Version,...}}
for expansion within the name. Also re-initialize from file if the
saved version is empty (e.g. if the debugger was registered before
the version field was present)
Change-Id: I45568d78147597b30074a2ce4ddcf569bce15192
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
next if file =~ %r{src/shared/qbs|/qmljs/}
s = File.read(file)
s.scan(/^using namespace (.*);$/) {
ns = $1
t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
before = $1
char = $2
if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
m
else
before + char
end
}
if t != s
puts file
File.open(file, 'w').write(t)
end
}
}
Change-Id: I44745947f315b73f0b983d4362f884580dc2d94b
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Two major areas of improvement:
- Make connections last, so that the initial setup does not trigger any
unnecessary checks.
- Make fetching the list of android virtual devices a background
operation.
Together they reduce the time needed to open the settings for me by
roughly 10 times.
Task-number: QTCREATORBUG-13735
Change-Id: I0839853dcdbdfe20a183a27888e55d3c56a9b815
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Only override a setting from the sdk provided settings file if the
sdk settings file contains the setting.
Change-Id: I29a0f88d5075bfe432eb89c90fb959ef984e17b6
Reviewed-by: BogDan Vatra <bogdan@kde.org>
There are numerous problems with gradle, so for now switch the default
to off.
Task-number: QTCREATORBUG-13470
Change-Id: I9d2fc216c91656a528875a0bc3b820d4f289b9b0
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Debug Deployment broke with Android 5. Also show Android 5 devices
as incompatible in the device dialog if we are using debug deployment.
Task-number: QTCREATORBUG-13419
Change-Id: Ic321cfa46eb724f87f338af9c4b50face06c7c06
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
We need to pass -force32bit on that platform.
Change-Id: Ib2e205c7147fc573ad20467429a08f47b774b94f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
This can use the faster route through QFileInfo::exist now.
Change-Id: Idb41b5d5185d7f02eacba498fb01f483d95e8d57
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
The backtrace in QTCREATORBUG-13081 suggest that something with
dev.serialNumber is wrong. The input (attached to the bug report) does
not indicate why we would misparse it. So add checking code
to all places where we index into line.
Change-Id: Ic8e4afb763dc1c899e9a1d0503d6494e2aea1223
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Switching from Ant to Gradle brings lots of advantages:
- it is way faster when rebuilding (25-50% faster than ant).
- it enables first class Android Studio integration.
- adding Android Extras libs (e.g. Google Play services, OBB, etc.) to
your project is now painless.
[ChangeLog][Android] Added Gradle support to build the APK.
Change-Id: Iee492954f8ffb2c22e6ab14a8a25faf644de9a51
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Less typing and less cycles than join(QString) where appropriate
Change-Id: I6ebc0e17e4d7fd9845864dd95b7de4ba4dad6906
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This change also adds a AbstractMacroExpander for the QtKitInformation.
It supports the following variables in the Kit display name:
%{Qt:version} - Qt version number
%{Qt:type} - Qt type
%{Qt:name} - Qt version name
%{Qt:mkspec} - mkspec used by the Qt version
Task-number: QTCREATORBUG-11118
Change-Id: I7263781336ab561c34880b187ebd55e81e6ca215
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
- Split up androiddeployqt into two steps: One building the apk,
and one deploying it to the device.
- The build apk step base class AndroidBuildApkStep is ihneritaged by
the qmake specific class QmakeAndroidBuildApkStep.
- The deployment step is still called androiddeployqt
- Move all qmake specific code to the qmakeprojectmanager plguin
- Flip the depencency between the android and qmake plugin, now
the qmake plugin depends on the android plugin, implementing
a interface the android plugin provides.
- Note: This removes the debug deployment for now.
Change-Id: I1c386640159ed14b637668abde8eb3b9009ab803
Reviewed-by: BogDan Vatra <bogdan@kde.org>
android list avd outputs "Target: Android L (Preview) (API level L)",
which we treat as API Level 20 now.
Change-Id: Idc74fc833ffd69959af9d25cdaaa115f35c06831
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
On some machines adb takes a longer than 5s to finish. The reasons for
that are unknown.
Change-Id: I949dc40b8f407aa98be0456df47a9ebe88e230a5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Filter the list of api levels to only show those that can be created.
Change-Id: I7aaaa58324ca44176e39982cda29d746011fa346
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
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>
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>
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>
