feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
38,558 Commits 108 Branches 368 Tags
36f94d36619df05e3f383e344fd1eab12c695262
Commit Graph

19 Commits

Author SHA1 Message Date
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Fawzi Mohamed
e7ac3bf16e ios: fix deploystep displayName updating 
still uses the default deploystepconfiguration, which gives some
artifacts (to be fixed later)

Change-Id: I3f4f8a71fbe4e18fc171aee571da72da1c9735db
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-05-27 15:37:31 +02:00
Eike Ziller
270e8fe537 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	src/plugins/ios/iosdeploystep.cpp

Change-Id: I97c80d288d7af30f4bf64509a09e0fe2e3b85f6f
 2014-05-20 14:44:31 +02:00
hjk
129d062a73 IosDeployStep: use QTC_ASSERT when appropriate 
Change-Id: I487f3ead6b72d558670dd4045c44b8ab09336e29
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-05-19 12:24:41 +02:00
Eike Ziller
6d1cc58697 Merge remote-tracking branch 'origin/3.1' 
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
 2014-05-16 16:54:50 +02:00
Fawzi Mohamed
fb1db53054 ios: warn if provisioning profile does not cover the targeted device 
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>
 2014-05-13 12:48:46 +02:00
Fawzi Mohamed
b6a1aff2a1 iosrunconfiguration: use more descriptive method/variables names 
removed use of shortened names

Change-Id: Icce8558a909e6fdd1c4d4f12ea273745fb21f5eb
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-05-08 13:08:08 +02:00
Fawzi Mohamed
88f85896f1 ios: make device simulated configurable in runconfiguration 
Change-Id: I54bcbd7f2142ab95618005f1f108a122bfe18d32
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-31 14:19:20 +02:00
Fawzi Mohamed
c4ab890997 ios: cache app path in deploy step 
avoid accessing target and runconfig in the run
method

Change-Id: I2d48ade1313d80e8041ea90f59f53f93858ab6b3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-02-14 15:38:41 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Fawzi Mohamed
4bd0fcbf8d ios: emit deploysetep::finished 
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>
 2013-11-28 19:13:05 +01:00
Fawzi Mohamed
242cba3065 ios: better error messages 
Change-Id: I2ccb7655320b18eed9f10c8b6130befe8c9cbdb0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2013-11-05 16:59:09 +01:00
Friedemann Kleint
fc1a209fe0 iOS: Unify translation of iOS-Device. 
Change-Id: I01374545ec3882a1dc9b08adccf4632f38438efb
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2013-11-04 19:37:12 +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
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
Tobias Hunger
9bb0a81525 IOs: Fix warnings about unused things 
Change-Id: I40a6aa486af7f4d819ae1f1f309f12042c8d2826
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2013-10-14 17:22:30 +02:00
Fawzi Mohamed
a874537b0f ios: better deploy messages (and handling of missing devices) 
Change-Id: I77faa28b1300bbf59f56cf20855147f67fd69368
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2013-10-14 16:11:58 +02:00
Fawzi Mohamed
8d96ce557e ios: preliminary support for ios 
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>
 2013-10-02 13:15:49 +02:00