summaryrefslogtreecommitdiff
path: root/src/plugins/android
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7'Eike Ziller2018-07-107-25/+133
|\
| * Android: Parse APK to find package name and other informationVikas Pachdha2018-07-094-1/+89
| * Android: Add API's to run Android SDK toolsVikas Pachdha2018-07-092-17/+37
| * Android: Use ipv4 host to connect to app in androidVikas Pachdha2018-07-063-3/+8
* | Android: add logging for build and runVikas Pachdha2018-07-046-15/+112
* | Android: Move most of QmakeAndroidBuildApkStepWidget to basehjk2018-07-023-31/+182
* | Android: Move AndroidExtraLibraryListModel to basehjk2018-07-025-2/+236
* | Android: Change the minimum API level supportedVikas Pachdha2018-06-273-5/+6
* | Android: Merge {Qmake,}AndroidSupport::androiddeployqtPathhjk2018-06-222-4/+5
* | Android: Move some generic apk build step code to basehjk2018-06-222-4/+111
* | Android: Do not disconnect a signal that was never connectedTobias Hunger2018-06-201-1/+1
* | Merge remote-tracking branch 'origin/4.7'Eike Ziller2018-06-191-1/+0
|\ \ | |/
| * Fix that bookmarks couldn't be added to .pro files with mouseEike Ziller2018-06-191-1/+0
* | Android: Remove code to help with upgrades from Qt 5.1hjk2018-06-133-15/+0
* | QmakeAndroid: Move some build-system agnostic items to Android basehjk2018-06-135-15/+31
* | Merge remote-tracking branch 'origin/4.7'Eike Ziller2018-06-111-3/+3
|\ \ | |/
| * Android: Fix messagesLeena Miettinen2018-06-111-3/+3
* | Merge remote-tracking branch 'origin/4.7'Eike Ziller2018-06-042-1/+2
|\ \ | |/
| * Android: Fix history completer keyChristian Stenger2018-05-311-0/+1
| * AndroidPlugin: show adb output in error caseTim Jenssen2018-05-311-1/+1
* | ProjectExplorer: Simplify BuildStepFactoryhjk2018-05-314-5/+2
* | Introduce static_container_castEike Ziller2018-05-292-4/+2
* | ProjectExplorer: Add RunConfigFactory::addRunWorkerFactory convieniencehjk2018-05-291-7/+4
* | Merge remote-tracking branch 'origin/4.7'Eike Ziller2018-05-284-11/+15
|\ \ | |/
| * Remove some lambdas from Utils::transform callsEike Ziller2018-05-282-6/+2
| * QmakeAndroid: Move RunConfigurationFactory to Android basehjk2018-05-231-0/+12
| * Finish merging Runnable and StandardRunnablehjk2018-05-232-5/+1
* | Centralize retrieving the "parent" build configurationEike Ziller2018-05-221-3/+3
|/
* Android: Make sure we can queue AndroidDeviceInfo in connectionsUlf Hermann2018-05-223-2/+4
* Android: Don't start avd if AndroidDeviceInfo doesn't want itUlf Hermann2018-05-221-1/+1
* Android: Merge output channels of AVD processUlf Hermann2018-05-221-0/+1
* Android: Remove AndroidRunnablehjk2018-05-165-95/+0
* Android: Add a key name constant for the package namehjk2018-05-161-0/+1
* Android: Use packageName directly in AndroidRunnerWorkerhjk2018-05-164-20/+20
* Android: Remove AndroidRunnable::{beforeStart,afterFinish}AdbCommandshjk2018-05-166-31/+34
* Merge "Merge remote-tracking branch 'origin/4.7'"Eike Ziller2018-05-161-1/+3
|\
| * Merge remote-tracking branch 'origin/4.7'Eike Ziller2018-05-161-1/+3
| |\
| | * Merge remote-tracking branch 'origin/4.6' into 4.7Eike Ziller2018-05-161-1/+3
| | |\
| | | * Android: Fix the android include pathVikas Pachdha2018-05-161-1/+3
* | | | Android: Pass RunWorker to AndroidRunnerWorkerhjk2018-05-163-9/+5
* | | | Android: Remove AndroidRunnable::amStartExtraArgshjk2018-05-164-9/+11
|/ / /
* | | Android: Remove AndroidRunnable::intentNamehjk2018-05-154-7/+6
* | | Android: Remove AndroidRunnable::environment()hjk2018-05-151-2/+0
* | | Android: Flatten then AndroidRunnerWorker hierarchy againhjk2018-05-114-113/+65
* | | Android: Consistently use nullptrTobias Hunger2018-05-091-2/+2
* | | Android: Use override consistentlyTobias Hunger2018-05-095-10/+10
* | | Android: Do not deploy when missing build configVikas Pachdha2018-05-091-1/+1
* | | QmakeAndroid: Introduce two new functions in QmakeAndroidQtSupporthjk2018-05-094-10/+12
|/ /
* | Android: Remove m_extraAppParams and m_extraEnvVars from Runnablehjk2018-05-094-9/+21
* | Android: Remove m_deviceSerialNumber and m_apiLevel from Runnablehjk2018-05-095-30/+22
View Lorry Controller Status