feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
89,589 Commits 108 Branches 368 Tags
afea900b966d202435292cb15101ee71b9299f19
Commit Graph

901 Commits

Author SHA1 Message Date
Fawzi Mohamed
d1cd1a490c ios: correctly replace cryptic Locked message when deploying 
Change-Id: I19e33d5c7e35f9d76c81469d3772bc800ce1760b
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
 2014-06-24 14:19:16 +02:00
Tobias Hunger
4eb2908c44 Unify "missing compiler" and "missing build configuration" tasks 
Everybody used to do their own thing...

Also unify the "Configuration is faulty" message we write into the
Application output window.

Change-Id: I0e5c4ec68155d66aa1d0ea53134b98917869e5c6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-06-23 15:04:04 +02:00
Daniel Teske
c78258cd57 Allow the user to restrict rc creation to certain .pro 
Task-number: QTCREATORBUG-10953
Change-Id: Iff1a31c007ac777bfa390d48237480ef56ffc0e4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-06-16 13:04:23 +02:00
Daniel Teske
d15e0aa9e7 RunFactories: Simplify pathFromId by using Core::Id::suffixAfter 
Change-Id: I2b65071be3e57c59588e6421d15c7739c257e1c5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-06-16 13:04:15 +02:00
Daniel Teske
204de740ec QmakeProject: Replace applicationProFilePaths by idsForNodes 
Change-Id: Ie10e8cb93f26eb2087272646668fafd480b0208d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-06-16 10:30:57 +02:00
Daniel Teske
241d3a1ef6 QmakeProject: Rework allProFiles() 
Change-Id: I49309565368fb8e00dd5a67c0e3ac77392924c75
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-06-12 12:56:48 +02:00
Fawzi Mohamed
f26d6a76a4 ios: add qmldebug dependency 
Change-Id: Iaebaba0eef6a8f7092c53cbe5364c6a2f740ba0d
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
 2014-06-02 16:00:05 +02:00
hjk
26b54747e2 RunControl: Make icon(path) a value member 
Change-Id: I7f7099d03a25a14d8df02273cca928e9f1fbfe1d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-30 13:07:54 +02:00
Orgad Shaneh
1bacbb943f De-noise RunConfigurations 
Change-Id: I9def38768c0243358022f56bba80af2080ac8d05
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-28 09:38:47 +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
Christian Stenger
53999b89fe Ios: Fix Qt4 compile 
Change-Id: Idd632e8c53472e86d26c339c3fe0dae27405711b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2014-05-20 11:44:45 +02:00
Orgad Shaneh
4e43e2edb4 Ios: Remove redundant null validation 
Change-Id: I1058e83fd4c16a162d79ef794382071da77a902c
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-05-20 08:50:49 +02:00
Orgad Shaneh
b3843939cb Ios: Remove unused loop 
Change-Id: Ic78064fa0bef5b4ad14b3ae2033da94457bad571
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-05-20 08:50:10 +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
152f9c3646 ios: always write out when a run ends 
Currently normal end of an ios run is silent. This looks strange as
the startup writes a string.

Change-Id: I64d082153b11ff6db4d6b1d85bce1da143cf329d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-05-15 11:10:31 +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
10252364bb ios: add comment about repeated constants 
Change-Id: Ibcce859abf8f97393e5d224eb6c3c63a3cddcf68
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-05-08 13:08:29 +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
Tobias Hunger
dc61b989ac Project: Use Utils::FileName as return type for projectDirectory(...) 
Change-Id: I3ea10aa204b1ea41702edab09884b416cd6d9e06
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-05-06 11:48:10 +02:00
Daniel Teske
d80814bdea IosQtVersion: Remove unsupported features: webkit and console 
Change-Id: Ie567c7a43500c302f3d116ef73c8422d70213ff2
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-05-06 10:31:02 +02:00
Orgad Shaneh
5505d1943f Ios: Remove unused local variables 
Change-Id: Id6b86e6e56d07a276e41ec83901c2aa3e1dbbe07
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-05-06 09:12:01 +02:00
hjk
2e757deab4 ProjectNodes: Refactor runConfigurationsFor() 
Rename to runConfigurations() and remove the node argument which is
available as 'this'. Adjust const-ness of node argument in
RunConfigurationFactory::runConfigurationsForNode

Change-Id: Icb63e96a305152f90135a2656536de2581faafaf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-04-29 12:35:29 +02:00
Christian Kandeler
eccc1198d6 Use double quotes instead of single quotes as per our guidelines. 
Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-04-22 10:06:40 +02:00
Eike Ziller
b687658663 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cpptools/cppcompletion_test.cpp

Change-Id: Ic5e75b3ef164de664a1449ffa8579beaf5b02521
 2014-04-08 11:18:40 +02:00
Friedemann Kleint
65e1923fb0 Fix warning about unused variable in IOS. 
Convert Q_PID to int using utility function.

Change-Id: Iab18b1b4044e323e14e63f9159a82ad5040117ce
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-04-07 09:35:06 +02:00
Daniel Teske
efecd15b1e BuildSteps: emitting tasks from init() works fine 
Change-Id: Ida5c7e9eea197d12ebe6e4bd86e90b2ef7e7a100
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-04-04 12:03:55 +02:00
Fawzi Mohamed
415602e04d iosrunconfiguration: always update dev type switcher 
Change-Id: I9c9956f20b33274f193fc69639ed7461ba96ff9f
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-04-01 19:55:04 +02:00
Christian Kandeler
73fc09acb7 Ios: Fix qbs build. 
Change-Id: I337af64834388ef643108d8502be0abcf53cd9c6
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-31 17:43:49 +02:00
Fawzi Mohamed
781e61a950 ios: make simulator device selection more robust vs corrupted settings 
Change-Id: I09657cbfb50a8dfeeb4122c920b24926684a1680
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-31 17:26:55 +02:00
Fawzi Mohamed
2ef08b7580 ios: add qml profiler support 
Change-Id: I6dbea675a77ed0d151dc6bbdcfa501c00107998c
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-31 15:13:04 +02:00
Fawzi Mohamed
04948228bb ios: fix update of executable path in the UI 
We now update after the profile has parsed, not when it is changed.

Change-Id: I70bf9bed85c77677d0ece0d7b99dff590a9e4d47
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-31 15:12:25 +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
bb846398bb ios: cleanup unused simulator stuff 
Change-Id: Id0e877a88bf4bafb44c4be655838253210bcefb3
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-31 13:45:00 +02:00
Christian Stenger
3012a70234 iOS: Fix typo in qbs file 
Change-Id: I7b501b3d0ca5e93791f4fa5fe12082b4f5d62a50
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-27 13:49:55 +01:00
Fawzi Mohamed
5c912059e0 ios: fix compilation 
remove leftover of bad rebase (localExecutableFilePath)

Change-Id: Ic5ce97176ade1800474fb1581ef6333ffb2752e1
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-27 12:45:06 +01:00
Fawzi Mohamed
3cd64380ff ios: correctly update run configuration names 
Change-Id: I46ea3e273f7e0e9a015c867a2bec261006bec117
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-27 11:17:36 +01:00
Fawzi Mohamed
2564231f47 ios: warn if debugging in without dSYM might have issues 
Task-number: QTCREATORBUG-11580
Change-Id: I97609d658a2da22fc47a499b28bbcde06a7d78f7
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-27 11:15:01 +01:00
Fawzi Mohamed
cbe8740a8f ios: adding dsymutil build step 
The lldb debugger sometime returns misleading debug information
unless a dsym has been created.
This creates a build step to do it.

Task-number: QTCREATORBUG-11580
Change-Id: I7acf2e539cf189d0237e1d502fab2837f17aa489
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-27 11:13:57 +01:00
Fawzi Mohamed
91a8596024 ios: translate locked message in output 
Change-Id: Ia43fec6716761b40be35e5bfebd453b7a6eabcd7
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-27 09:31:17 +01:00
Fawzi Mohamed
fcb8e6c283 ios: fix Xcode path detection 
Change-Id: Icd175f4f0d7d22d805fcf2f481da42321f827490
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-26 18:09:25 +01:00
Fawzi Mohamed
da20bc9f27 ios: check also if rootQmakeNode is null 
Change-Id: Id02c059045e486a02dfcf4f299860f3d953c395b
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-26 18:07:53 +01:00
Christian Stenger
3ec9eadb6d ios: Fix compile for Qt less than version 5.2 
Change-Id: I96f4953f945af1e5ddd2cabca854ec7b1a68fa80
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-24 17:18:46 +01:00
Fawzi Mohamed
84cf3cf7a5 ios: immediately skip running when the executable is missing 
Change-Id: I9a867f2a62811e84fa758e9d27272b6583067afb
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-24 11:58:05 +01:00
Fawzi Mohamed
d419069b4d ios: qml debug support 
Change-Id: I0fdd7a35de7b446cd991407d7c30b92cd3cc7787
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-24 11:57:50 +01:00
Fawzi Mohamed
9c17e9cb72 ios: simulator support for Xcode 5.1 
update iossim to be based on version 1.9.0, so that we can support
the new Xcode 5.1. Keep the old version around and use it
with older Xcode.

Task-number: QTCREATORBUG-11714
Change-Id: I4ad9f922f22367c8371b3be68eae5b6dfdf4df5c
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-14 21:35:28 +01:00
Joerg Bornemann
84df758ec6 use new base import style in qbs files 
Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-03-11 14:20:22 +01:00
Fawzi Mohamed
1caf8f8a00 ios: use consistent paths in build dir creation 
Change-Id: I23ed6569eb0b87a32d4e0920a9ea42536e9e2af4
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-11 12:46:01 +01:00
Fawzi Mohamed
8695c64012 ios: remove temporary devices 
Developer mode activation generates temporary devices that will never
be usable again. Remove them if they were picked up.

Change-Id: Iff35b640d2c2e8394b108fd8d224a2b6ea8e1626
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-11 12:01:27 +01:00