summaryrefslogtreecommitdiff
path: root/src/plugins/android
Commit message (Collapse)AuthorAgeFilesLines
* Android: Fix the SDK platforms parsing for SDK tools 26.1.1Vikas Pachdha2017-09-281-2/+4
| | | | | | Task-number: QTCREATORBUG-18962 Change-Id: I780193be482ebc151931196792068d7c4d1ad808 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Android: Fix search path for QML modulesBogDan Vatra2017-09-061-1/+1
| | | | | | | | QT_INSTALL_IMPORTS was used by Qt 4.x, Qt 5.x uses QT_INSTALL_QML Change-Id: I9c25ef005f3c5dc8cfc8d0b965426e22b542fb70 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Android: Search for gradle template in QT_DIR/src/3rdparty/gradleBogDan Vatra2017-08-301-4/+2
| | | | | | | | | | | | Qt 5.6.3 LTS adds gradle template but QtCreator failed to use it because it compares Qt versions instead to search for gradle templates in QT_DIR/src/3rdparty/gradle Task-number: QTCREATORBUG-18811 Change-Id: I97c817f143a1d76fe4e2544b138cad9f4914eeee Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Android: Fix default JDK path discoveryVikas Pachdha2017-08-291-6/+17
| | | | | | | Task-number: QTCREATORBUG-18691 Change-Id: Ibd17e7edf1c2cfdcc54ff2b9f16a9125bb217a84 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Fix copyright year in plugin info, --version, and macOS infoEike Ziller2017-08-241-1/+1
| | | | | | | | By using the new QTCREATOR_COPYRIGHT_YEAR variable Task-number: QTCREATORBUG-18612 Change-Id: I3bcf0319660d210436d3130c00f43325c460a66c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Android: Add android-clang to suggestedMkspecListBogDan Vatra2017-08-171-1/+2
| | | | | | | | | It is needed for android-clang qt builds Task-number: QTBUG-60455 Change-Id: Ice1c552754214fe4ec47b970da86087d03e30530 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Android: Support API level 25 and 26Vikas Pachdha2017-08-161-1/+3
| | | | | | | Task-number: QTCREATORBUG-18690 Change-Id: Ifa25d95c75e854be1b88065925dd77296720f183 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Android: Fix QML debuggingv4.4.0-rc1Vikas Pachdha2017-08-153-4/+13
| | | | | | | | Specify the qml server address and use correct default loop back address in qmlengine Change-Id: I9b77cb3385041bbe79900e7f7a188ca26124bacc Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* ProjectExplorer: Rename worker dependencies to "startDependencies"Ulf Hermann2017-08-082-3/+3
| | | | | | | | There will be stopDependencies, too, which apply when stopping the runcontrol. Change-Id: Id72771d28cbb6b254572c9f93db93e0d054b890f Reviewed-by: hjk <hjk@qt.io>
* Android: Fix SDK tool's version displayed in the errorVikas Pachdha2017-07-311-2/+3
| | | | | | | | Task-number: QTCREATORBUG-18655 Change-Id: Iaee5118a74b4e83903af50d03e72c8bd6fa4a8b4 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Android: Simplify code assist by using KeywordsCompletionProviderDavid Schulz2017-07-276-172/+10
| | | | | | Change-Id: I566e54e8cb539227019fd9cf94113924d1ac9822 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Android: Make UI text more clearLeena Miettinen2017-07-271-1/+1
| | | | | | | | The definite article "the" should be "an", but I would like to rewrite the notice to use simpler language. Change-Id: Ic611343724f32b3b1f22a5c768c387cafceb0890 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Android: Fix sdkmanager timing out on slower machinesVikas Pachdha2017-07-255-14/+30
| | | | | | | | | | sdkmanager times out on slower machines or with slower network connection. Increase the timeout and show timeout message box Task-number: QTCREATORBUG-18458 Change-Id: I9118024ec1438ef9c18842df2f7431e696c73f92 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Plugins: Fix that mimetype definition was not valid JSONEike Ziller2017-07-251-10/+10
| | | | | | | | | | | | | JSON officially does not support multiline strings, so we should use the same mechanism that we already use for the plugin description (i.e. additionally support arrays of strings which are interpreted as lines). This just happens to work because Qt's JSON parser eats it without choking. Change-Id: I25ef04600b209775c5a7af916c687fda4a8b1a4d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Debugger: Use a somewhat less intrusive hack for 'start at main'hjk2017-07-122-4/+1
| | | | | Change-Id: Ie649a4a11c88f3686cd6ed1e73f34c7c78fd0e13 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* ProjectExplorer: Remove Connection as concepthjk2017-07-072-3/+5
| | | | | | | | | | | | | | | | | | | It turns out that one "Connection" per RunControl doesn't map well to the uses we have. Instead, RunWorkers need to know individually how to connect to the place where they can work, but they are already specific enough to be able to use a standard class (like QUrl) as their way to specify the needed entry point. In theory one could see a RunControl's connection as an aggregation of its workers connection bits, but that does not really seem to be needed in code. As consequence, replace UrlConnection by a plain QUrl, and also the HostName connection by a QUrl with hostName set. Change-Id: I40c97e37779314ac0a77041e864a18eadb78f987 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Remove unused IAssistProvider::supportsEditorEike Ziller2017-07-032-6/+0
| | | | | | Change-Id: Ieb2a36bfddbf4f2cade02cbf62b28d112dcb8f10 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* Android: fix compileDavid Schulz2017-06-301-0/+2
| | | | | Change-Id: I9d3e82db5055ddb1310573eba9353227268dcea3 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Android: Let user specify shell commandsVikas Pachdha2017-06-3013-71/+569
| | | | | | | | Let user specify list of shell commands to run before app starts and after app quits. Change-Id: I9794fb96180530ca6c28ce6581fda51a25be28d4 Reviewed-by: hjk <hjk@qt.io>
* Android: Simplify run control constructionhjk2017-06-305-150/+18
| | | | | | | Take advantage of new infrastructure. Change-Id: If2d2f839b8be1fad2be3b79e21de3c0e475d88cf Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Android: Re-enable QmlProfilerhjk2017-06-295-60/+49
| | | | | | Change-Id: Icd73475be421e6813b0d496020461e7020b547dd Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* ProjectExplorer: Introduce a Utils::OsType IDevice::osType() functionhjk2017-06-282-0/+6
| | | | | | | | | | | | E.g. for easier construction of command lines in situations like if (isLocal()) runnable.commandLineArguments = argumentString(Utils::HostOsInfo::hostOs()); else runnable.commandLineArguments = argumentString(Utils::OsTypeLinux); Change-Id: I5a35304e5d1b5a042952201f39f4134a5cd0ce24 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: Make Android manager activity start arguments configurableVikas Pachdha2017-06-2811-21/+266
| | | | | Change-Id: I2e09029e4eb0b8a57fda53efff3d42f109bfe905 Reviewed-by: hjk <hjk@qt.io>
* Mobile platforms: initialize params in one goTim Jenssen2017-06-221-5/+2
| | | | | Change-Id: I2b6097b6c1212e750b27f95055331fed6736b182 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Android: Make selector() arguments to runAdb implicithjk2017-06-191-23/+19
| | | | | | | Less code on the user side. Change-Id: Ibf19ca725557c2de67743bd3b4b621f04bb896c7 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Debugger, QmlProfiler et al: Replace AnalyzerStartParameterhjk2017-06-161-12/+1
| | | | | | | | | | | ... and QmlProfilerRunner::Configuaration by PE::UrlConnection, and call it 'serverUrl' on the user side. That's the only variant we ever had and avoids "translations" between three structures that are essential the same. Change-Id: I33386b2b8d2a7985ff934f6f8f840de0831bf9c1 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Mobile platforms: Do not use QLatin1String in BuildStepsTobias Hunger2017-06-131-9/+8
| | | | | | Change-Id: I3d67e94e7dc2d86ac1eba641562ee4a045f95d6c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Android: Convert into a RunWorker based setuphjk2017-06-1211-240/+161
| | | | | | | | | This moves all of the RunControl implementation into a single RunWorker, not yet splitting it up into separate RunWorkers which is the final goal of this series. Change-Id: I7373105603505aa4fffd7fe5ff0145f0128b34bc Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Android: Remove useless testRobert Loehning2017-06-061-3/+0
| | | | | | Task-number: QTCREATORBUG-18331 Change-Id: I8c93d0b92c61c6cf58351d74871abb4267badd82 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Merge remote-tracking branch 'origin/4.3'Orgad Shaneh2017-06-023-6/+20
|\ | | | | | | Change-Id: I56004e3ec9dc9d92d33bdae438c4f7e069eccc45
| * Add missing 64-bit ABIs (since API 21) in Android AVD creation dialogJake Petroules2017-05-301-3/+5
| | | | | | | | | | | | Change-Id: Ife7d978b8c2e6743f34d670e42ac245249c52a88 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Recognize mips64 toolchains from the Android NDKJake Petroules2017-05-292-3/+15
| | | | | | | | | | | | | | Adapt a couple mips64-related tests at the same time. Change-Id: I9313419cfe561c7e949f343d2008f7b370ad2b39 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Merge remote-tracking branch 'origin/4.3' into masterOrgad Shaneh2017-05-231-14/+28
|\ \ | |/ | | | | Change-Id: I01ab8c85ea3372b6dce4142ddb9cf92d903ffca6
| * Android: Delete auto generated kits without valid Qt versionVikas Pachdha2017-05-221-3/+10
| | | | | | | | | | | | Task-number: QTCREATORBUG-18229 Change-Id: I55a31a12b00eefe70c224c2d9e4939218827e1be Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| * Android: Fix android kit missing compiler on NDK path changeVikas Pachdha2017-05-181-11/+18
| | | | | | | | | | | | Task-number: QTCREATORBUG-18221 Change-Id: I4481d252064476f905a02a53c487664f3e1d4a4c Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | TextEditorActionHandler: Use configuration instead of inheritanceEike Ziller2017-05-181-17/+5
| | | | | | | | | | | | | | Avoids creating subclasses just for implementing a single method. Change-Id: I813a0a20eaba8fefa004b74f92d48a9a9c4bfcc1 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Fix text based Android manifest editor actionsEike Ziller2017-05-184-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All text editor actions were disabled. We want the actions to be enabled when the focus is in the text editor widget in the Android manifest editor. For this the text editor action handler must differentiate between the _editor_ and the _context_ that it handles. The one for the text based manifest editor handles the manifest editor, but the context is specific to the text editor part. Change-Id: Ib91cc763cb27333a7d5b6e5b036dfead33961871 Reviewed-by: David Schulz <david.schulz@qt.io>
* | ProjectExplorer: Split Target and ToolRunners into smaller taskshjk2017-05-153-3/+5
| | | | | | | | | | | | | | | | This increases re-usability of activities like 'port gathering', and makes their use less dependent on actual device implementations. Change-Id: I017cb74874f2b38c487ba2d03906a675d5618647 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Merge remote-tracking branch 'origin/4.3'Eike Ziller2017-05-094-2/+59
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/debugger/cdb/cdbengine.cpp Change-Id: Ib9aeccc4162c43e9ee3d85847d96678045625dd0
| * Android: Fix C++ debuggingv4.3.0-rc1Vikas Pachdha2017-05-083-1/+58
| | | | | | | | | | | | | | | | | | | | Target Async mode enabled only for ndk version > 11 Task-number: QTCREATORBUG-18111 Change-Id: I218b6c23c1da13091f0035193a43e6117748055a Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| * Android: Fix AVD creationVikas Pachdha2017-05-051-1/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-18161 Change-Id: Ibe7f779d26c199a91634c5921556df67d7c5aada Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Merge remote-tracking branch 'origin/4.3'Eike Ziller2017-05-046-432/+121
|\ \ | |/ | | | | | | | | | | Conflicts: tests/auto/debugger/tst_dumpers.cpp Change-Id: Id8b53b000f94a1b5ab923db79f67bad3276d09dc
| * Revert "Android: Improve application output window by adding filters"Ulf Hermann2017-04-286-432/+121
| | | | | | | | | | | | | | | | | | | | This reverts commit d4ca232d54a9a5dabc6955139f3d3c2dcb0875f0 and fixes QML profiling on android. Task-number: QTCREATORBUG-18120 Change-Id: I09b9062da197a4c6c0a7034f98a2bb0b41f1d559 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Debugger: Remove DebuggerRunControlhjk2017-04-282-21/+17
| | | | | | | | | | | | | | Use plain RunControl + DebuggerRunTool combo instead. Change-Id: Ib71b5eab50da667b9d71dcc6689d2643ad8ecdee Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Debugger: Reduce explicit DebuggerRunControl usehjk2017-04-271-2/+2
| | | | | | | | | | | | | | Aim is to replace it with its ProjectExplorer::RunControl base. Change-Id: I30f837050e7c016887dc4b6cfef10b947f4f88ed Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Allow giving TextEditorFactory custom CommentDefinitionEike Ziller2017-04-261-1/+1
| | | | | | | | | | | | | | | | It was not possible to set custom comment styles. Also simplifies the code for the predefined styles. Change-Id: Id7f345d65b747bfac5a15e3eb15cd2beb106b281 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Debugger et al: Move code from DebuggerRunControl to DebuggerRunToolhjk2017-04-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | It's tool specific, so put it into the tool (only) related code. The additional level of indirection will go again, plus the original one will be removed once the *DebugSupport classes can directly use DebuggerRunTool as base. Change-Id: Ieaa386a0f7d724b09cedaaba8fb7d1e6dc4ad55b Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | Merge remote-tracking branch 'origin/4.3'Eike Ziller2017-04-1930-581/+2177
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/plugins/genericprojectmanager/genericproject.cpp src/plugins/genericprojectmanager/genericproject.h src/plugins/genericprojectmanager/genericprojectnodes.cpp src/plugins/genericprojectmanager/genericprojectnodes.h Change-Id: Ie0c870f68c8d200a75489b75860987655b2f6175
| * Android: Fix build with namespaced QtChristian Kandeler2017-04-121-0/+3
| | | | | | | | | | Change-Id: Iecd44b8da2a5d35f6f98ea4a9b142853b73f25fd Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Android: Improve application output window by adding filtersBogDan Vatra2017-04-126-121/+433
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - allow the user to choose the visible log levels - allow the user to choose which activities/service(s) logs are visible - wakeup the device (API 20+) - use only the most recent logs (API 21+ add "-T 0" to logcat params) - use logcat -v time format, which is the same on all Android versions In the future we can even allow the user to choose which parts of the log line are visible, e.g. time, log level, TAG, PID, Message Task-number: QTCREATORBUG-16887 Change-Id: I07ce00aff59a479660f5ac6da75eef973ba3f627 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
View Lorry Controller Status