feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
72,644 Commits 108 Branches 368 Tags
6ff1723c4cb709ebffe2bb0c593371c51e6cf736
Commit Graph

218 Commits

Author SHA1 Message Date
Daniel Teske
9705ed8a1b Android: Fix deploy regeression 
Task-number: QTCREATORBUG-10777
Change-Id: Ie02ecbd95c38a50512b943e5f688bf4187a1eda5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-11-14 13:21:28 +01:00
Daniel Teske
e79cdc1690 Android: Rewrite waitForAvd() 
Now takes a QFutureInterface to enable canceling and beautify the code
by splitting it up.

Change-Id: Ifedf19c3ad1a37a9b7cb6b7db8ec799ceebc5392
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
 2013-11-14 12:07:50 +01:00
Daniel Teske
adc25d1e02 Android: findAvd() return serialNumber instead of bool 
So that the function can be reused by waitForAvd.

Change-Id: I0b7a86a13bf6a5f5b16d1d1cab362e7200a9a26f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
 2013-11-14 12:07:45 +01:00
Daniel Teske
bfad6f107a AndroidDeployQtStep: Run in separate thread 
Fixes the inconsistent state from
Task-number: QTCREATORBUG-10710

Change-Id: Ifabb1eef4b81e6d33244fd7af8becc453dd66669
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-11-13 16:39:46 +01:00
Daniel Teske
ae55018548 Android: Fix in source builds with Qt 5.2 
Now the build directory is by default android-build, so by default the
source and build directory don't clash anymore.

Task-number: QTCREATORBUG-10661
Change-Id: I054bd3790f9bc9720536aac301bee192cb9f0429
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
 2013-11-07 16:47:20 +01:00
hjk
d7d27fccbc Rename plugins/qt4projectmanager to qmakeprojectmanager 
This finally renames the plugin itself.

Change-Id: Ibdf4f4b4e9776c2fdc809e0127f3e1310de44bd1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-29 17:57:06 +01:00
hjk
ce9c2efd1f Qt4ProjectManager: Rename {Qt4,Qmake}{Project,Pr{i,o}FileNode} 
Change-Id: I27139d8ccc17b665853bec4a37e80568680b5fcc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-10-29 14:54:53 +01:00
hjk
1d9d3885b4 Qt4ProjectManager: Rename {Qt4,Qmake}BuildConfiguration{Factory,} 
Change-Id: Id49e347cc448f6a28271b6af775d56b6e00b4908
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-10-29 13:39:48 +01:00
Friedemann Kleint
119548a0ff Remove most leading/trailing blanks from translated messages. 
They are a hassle for translators and reviewers alike.

Change-Id: I363138212b692cf75fe1605df8af3721315d37e1
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-24 10:50:56 +02:00
Daniel Teske
04ea1898b5 Android: Search for a suitable emulator before starting a new avd 
Note, that we don't know the names of the started avds, so we look
for a avd that has the same abi and apiLevel.

Task-number: QTCREATORBUG-10411
Change-Id: I5f6ff3ee0dddcf2bb8fca981ccedf437e32da677
Reviewed-by: BogDan Vatra <bogdan@kde.org>
 2013-10-22 17:48:38 +02:00
Friedemann Kleint
163f110096 Fixes in translated messages. 
Change-Id: Ie1aa0547281d9a1ab31f00e44c4e09dd96c60543
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-18 13:14:14 +02:00
Daniel Teske
1df66a18d1 Android: Rework sdkTargets() to cache the output of adb 
Also rename/change highestAvailablePlatform to highestAvailableSdk.
This fixes a bug reported on irc, where the lists for sdk and ndk
were different and the highestAvailablePlatform was not available
as in the sdk.

Change-Id: I17fec9e8ce1913e933ddcf8eaa21d6bb6e14c5be
Reviewed-by: BogDan Vatra <bogdan@kde.org>
 2013-10-18 13:09:27 +02:00
hjk
35695ebb0c Qt4ProjectManager: Rename the "normal" qt4* files to qmake* 
Change-Id: I5e173900a4008c72c67a30eaa9c101027c1b43af
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-10-16 14:30:05 +02:00
hjk
ebcd992577 Rename namespace Qt4ProjectManager to QmakeProjectManager 
First step towards plugin renaming.

Change-Id: I8ac017660a7aa2bda0d7bb7d72ab0cfceaf6cfd2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-10-16 12:09:59 +02:00
Leena Miettinen
e902945b7e Android: fix UI text capitalization and punctuation 
Fix typos and style issues.

Change-Id: I8d1bbccd55e7558e7f8a8bedbab95f4bb8a8478f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-09 17:50:52 +02:00
Daniel Teske
cf69783c0f Android: Restrict deployment factories to targets with the right qt 
Change-Id: I753023550f76b8b1b56fbdcd5176bcfa855e66bc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-09 17:17:26 +02:00
Daniel Teske
0a43f097de Android: Handle cases where the project is unparsed. 
Change-Id: If1757fff8ff458610dae8cbfcf561154c7d56753
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-09 16:35:48 +02:00
Daniel Teske
1262310798 Android: androiddeployqt support 
Change-Id: I37d706b4e11c6e1353a8ee73378b7d080080678c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
 2013-09-26 17:13:27 +02:00