summaryrefslogtreecommitdiff
path: root/src/plugins/ios/iosdeploystep.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-05-161-3/+64
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/clangcodemodel/test/clangcompletion_test.cpp src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp src/plugins/projectexplorer/projectexplorer.pro src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp src/plugins/vcsbase/vcsplugin.cpp src/shared/qbs Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a
| * ios: warn if provisioning profile does not cover the targeted deviceFawzi Mohamed2014-05-131-3/+64
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-12175 Change-Id: I58108bfca92add161ae3c1999954d073b30dba9c Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | iosrunconfiguration: use more descriptive method/variables namesFawzi Mohamed2014-05-081-1/+1
|/ | | | | | | removed use of shortened names Change-Id: Icce8558a909e6fdd1c4d4f12ea273745fb21f5eb Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* ios: make device simulated configurable in runconfigurationFawzi Mohamed2014-03-311-1/+1
| | | | | Change-Id: I54bcbd7f2142ab95618005f1f108a122bfe18d32 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* ios: cache app path in deploy stepFawzi Mohamed2014-02-141-3/+5
| | | | | | | | avoid accessing target and runconfig in the run method Change-Id: I2d48ade1313d80e8041ea90f59f53f93858ab6b3 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* ios: emit deploysetep::finishedFawzi Mohamed2013-11-281-8/+10
| | | | | | | | | | | iosdeploystep did call reportFinished on the future interface. This is incorrect, the finished signal should be emitted instead This lead to a reuse of the future due to missing call to buildStepFinishedAsync which lead to failing on the second run of the deploy step. Change-Id: I96b8874bc98c77453d5c0af96c818dff6e955167 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* ios: better error messagesFawzi Mohamed2013-11-051-3/+17
| | | | | | Change-Id: I2ccb7655320b18eed9f10c8b6130befe8c9cbdb0 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* iOS: Unify translation of iOS-Device.Friedemann Kleint2013-11-041-5/+1
| | | | | | Change-Id: I01374545ec3882a1dc9b08adccf4632f38438efb Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Rename plugins/qt4projectmanager to qmakeprojectmanagerhjk2013-10-291-3/+3
| | | | | | | This finally renames the plugin itself. Change-Id: Ibdf4f4b4e9776c2fdc809e0127f3e1310de44bd1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Qt4ProjectManager: Rename the "normal" qt4* files to qmake*hjk2013-10-161-3/+3
| | | | | | Change-Id: I5e173900a4008c72c67a30eaa9c101027c1b43af Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* Rename namespace Qt4ProjectManager to QmakeProjectManagerhjk2013-10-161-2/+2
| | | | | | | First step towards plugin renaming. Change-Id: I8ac017660a7aa2bda0d7bb7d72ab0cfceaf6cfd2 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* IOs: Fix warnings about unused thingsTobias Hunger2013-10-141-2/+0
| | | | | Change-Id: I40a6aa486af7f4d819ae1f1f309f12042c8d2826 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* ios: better deploy messages (and handling of missing devices)Fawzi Mohamed2013-10-141-0/+13
| | | | | Change-Id: I77faa28b1300bbf59f56cf20855147f67fd69368 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* ios: preliminary support for iosFawzi Mohamed2013-10-021-0/+231
first work in progress support for ios * separate iosTool using xml communication used for device info and run * iossim tool to handle the simulator * debug prepared but not working * separate gcc toolchain detection fix for simulator 1) add a QT built for ios 2) open a project, for example qtbase/examples/widgets/animation/animatedtiles/animatedtiles.pro 3) build/run... Change-Id: I7e01604e416338cbe4692dfb34f5d3f31312702d Reviewed-by: Eike Ziller <eike.ziller@digia.com>
View Lorry Controller Status