Commit Graph

901 Commits

Author SHA1 Message Date
Fawzi Mohamed
0db9d98db3 ios: adding port information to ios devices
Change-Id: I0243735159b02ac4afaf3d14ecb20381439a3997
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-11 12:00:44 +01:00
Fawzi Mohamed
c4b617ab12 ios: correctly handle exe path in subdir projects
Change-Id: I77c90933bf2f0fe9c2ae59bf76638adf995c368a
Reviewed-by: Markus Goetz <markus@woboq.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-11 10:14:10 +01:00
Fawzi Mohamed
384fc4096b ios: marking plugin as non experimental
Change-Id: I06982188952d23ecee876dd4a7d6e805b81a7cb5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-04 12:39:56 +01:00
Fawzi Mohamed
2e0812bffd ios: fix access of deleted run control
Change-Id: I8c65f5d9e3480b5c60157cd46da3ef57a63cf32c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-25 10:44:49 +01:00
Fawzi Mohamed
6daa558fb3 ios: detect switch usermode -> dev mode
this does polling, but only with devices in user mode connected...

Change-Id: I828715a2b4a35f8f9b3bdbcf0da9a74990f3047f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-19 19:11:43 +01:00
hjk
c68ebeed2e QtcProcess: Introduce a QtcProcess::Arguments class
This is used to get a platform-agnostic handle on "command line
arguments". It essentially wraps a single QString on Windows,
and a QStringList everywhere else.

As a consequence, several occurrences of #ifdef Q_OS_*
can be removed from the codebase.

Change-Id: Ic93118c1bd0bce0ebb58f416d395dbaebb861772
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-02-19 09:19:28 +01:00
Fawzi Mohamed
ef7a5836be ios: explicitly stop an application when running on the same device
iOS devices can run an application at a time.

Change-Id: I85a24ff32fbee571830a4bc4be8b18259f87924a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-14 15:40:04 +01:00
Fawzi Mohamed
3a2157d4e9 ios: improve run handling
disabling running when running is not possible with message explaining
it:
* device is not available (and tell user if another device is available)
* profile parsings

Change-Id: I8a2e8e4486555b09de2ac4ceab89997286c81454
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-02-14 15:39:39 +01: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
Orgad Shaneh
7ed1576083 Clean up single namespace forward-declarations
Done using the following ruby script:

Dir.glob('**/*.h').each { |file|
  if File.file?(file)
    s = File.read(file)
    t = s.gsub(/^namespace .+ \{\n\s*class .*;\n\s*\}.*$/) { |m| m.gsub(/\n\s*/, ' ').gsub(/\s*\/\/.*$/, '') }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  end
}

Change-Id: Iffcb966e90eb8e1a625eccd5dd0b94f000ae368e
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-12 09:30:37 +01:00
Tobias Hunger
a8ea31bf09 FileUtils: Add static method to construct FileNames from Latin1
Change-Id: Ida513eb0537e2ef0c55887d0df21de956e85e983
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-11 10:46:09 +01:00
Eike Ziller
b03a981a41 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/shared/qbs

Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
2014-02-11 09:14:22 +01:00
Eike Ziller
39a29dcfd9 Fix build with msvc2010
override on destructors are not very useful anyhow, but also msvc2010
doesn't like them at all.

Change-Id: I2d5f4b0d6148c5e66d2cba604d305707269d12e0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-07 09:26:22 +01:00
Fawzi Mohamed
242b839375 ios: use QTC_OVERRIDE consistently
Change-Id: I154b70896b359e09f53607bedd968a5e7a0ab148
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-02-06 17:46:55 +01:00
Fawzi Mohamed
911cdc9188 ios: fix iosrunconfiguration m_arguments persistency
Change-Id: I11b719725ed788cbdd97b0e64d69880949634905
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-01-22 10:42:54 +01:00
Eike Ziller
e95037347a Merge origin/3.0 2014-01-21 14:17:16 +01:00
Fawzi Mohamed
1ce5b1273a ios: fix handling of command characters in run
Xml does not support control characters (even if encoded), thus
QXmlStreamWriter does not encode them, and QXmlStreamReader gives an
error with them.
Thus outputting a control char would stop the application.
Now we send them with a special tag and decode them.
Note that the Output pane does some emulation of terminal behavior
when receiving them.
Sending app output as block because otherwise the stange logic
within the OutputPane inserts spurious newlines (a string not
containing a newline always gets a newline prepended) .

Task-number: QTCREATORBUG-11219
Change-Id: I3557ffbb23ca2ea4eec9a97335a95580c9c4482b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-01-21 13:43:19 +01:00
Eike Ziller
851f255b9d Merge remote-tracking branch 'origin/3.0'
Conflicts:
	src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
	src/plugins/qmlprofiler/qmlprofilertraceview.cpp

Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352
2014-01-15 14:04:41 +01:00
Fawzi Mohamed
323a0c6291 ios: speed up device debugging
Correctly use the device specific cached symbols to avoid downloading
them from the device (big slowdown).

Task-number: QTCREATORBUG-10884
Change-Id: Ic82482e4b1dadf55f695a67fd420ac1b095a3ca1
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-08 13:42:43 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +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
Eike Ziller
e035ae6df1 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/stdtypes.py
	src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp

Change-Id: I5d86746d58960e41e01e725ccb2a6c00890f0dfd
2013-12-18 11:02:16 +01:00
Fawzi Mohamed
293d4d9a6d ios: correcly update executable path in the ui
changing the build directory did not update the path shown in the
run configuration ui (but the correct one would be used)

Task-number: QTCREATORBUG-11080
Change-Id: I4105cb6ffd21bffe59e9bbbccdf427caf88646d6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-12-16 16:31:05 +01:00
Eike Ziller
dad0140134 Merge remote-tracking branch 'origin/3.0' 2013-12-12 10:06:09 +01:00
Eike Ziller
deb43b4c8a Preferences: Add default implementation for filtering
The default "matches" method now takes the widget and looks for all
child labels, checkboxes, push buttons and group boxes.
Because of that, the former "createWidget" method
can be called multiple times without creating a new widget
(-->widget()), and the "finished" method must ensure that the created
widget gets deleted, since not all widgets that were created are added
to the UI anymore.

Change-Id: Ia231c7c78dd8819146668e6447d36d22e7836904
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-10 13:31:48 +01:00
Fawzi Mohamed
27d10d8dcd ios: don't delete autodetected desktop kits
Change-Id: Id4ce4499bb216947cf88f2f514d17b03f717eba6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-10 10:27:15 +01:00
Eike Ziller
29d6836608 Merge remote-tracking branch 'origin/3.0' 2013-12-09 12:41:09 +01:00
Kai Koehne
9be80434d3 Fix compilation of ios plugin with Windows 64 bit
Q_PID is a pointer under windows, and the compiler won't allow us
to convert a 64 bit pointer to int.

Task-number: QTCREATORBUG-11026
Change-Id: I34e45bf2ef1e565c5967fac6b482c14117a04578
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-09 08:31:59 +01:00
Eike Ziller
072d551c73 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e
2013-12-05 11:58:42 +01:00
Jan Kundrát
9206fefb6b Fix build failure
QStringList::join doesn't accept a QLatin1Char on my system. This fixes a build
regression introduced in commit fccffba04b.

Change-Id: I98d8339032cb5ea315e09860aac3db91ab21d4c5
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-05 09:04:40 +01:00
Fawzi Mohamed
5d4e9066c8 ios: cleaner kill of subprocess of iostoolhandler
try to first terminate (sig TERM) the tool before
killing it (this ensures a cleaner shutdown of the
connection to the device).

Task-number: QTCREATORBUG-10922
Change-Id: Ib39fbd1d35a651cdb51364532bdef5b69cb1347e
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-12-04 15:40:07 +01:00
Fawzi Mohamed
fccffba04b ios: fixing DYLD_FALLBACK_FRAMEWORK_PATH
adding /System/Library/Frameworks for completeness

Change-Id: If2fbe015af591eb3ff820b2ea2f732b2d4c08e01
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-12-04 15:39:24 +01:00
Fawzi Mohamed
ea34160bef iosdeploystep: remove unused code
Change-Id: Ic3f068f2619324bfb5eb674377ce55a362c2d919
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-04 13:12:26 +01:00
Fawzi Mohamed
92cd92bb21 ios: improve kit generation
* remove all unknown autodetected iphone* kits
* update more thoughly existing kits

Change-Id: Ia71328a3f88eaede28f9199f1c301f23a88ad58b
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-12-02 15:47:08 +01:00
Fawzi Mohamed
11037dfcb2 ios: fix compilation on other platforms
fix ternary operator types

Change-Id: I4f9a0eb100fd6ca4e65e91ef67a53331d3f8faaa
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-12-02 13:19:52 +01:00
Fawzi Mohamed
d5a8adc156 ios: ensure that the private dependencies are resolved by dyld
Change-Id: I36f493dc83a906fb2291b156488531cfff633d4a
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-12-02 12:35:39 +01:00
Fawzi Mohamed
0489adf0cb iostoolhandler: thighten stop process
gurantee that finished is emitted also when the process fails to start
and always after the sub process has actually finished.

Change-Id: I716ebf62074dc77790716e60e88348a932cbe9f6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-12-02 11:03:56 +01:00
Fawzi Mohamed
5a09523726 iosdevice: guard detection handlers against foreign exceptions
Change-Id: I1f74aff3aa68cf8334ede232af61c85f3152adb9
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-12-02 11:03:38 +01:00
Fawzi Mohamed
8e9bf6d0d8 ios: create devices in the disconnected state
The device status is updated only when it is connected or disconnected.
Thus a restored device would mantain the unknown state in which the user
cannot remove the device.
Using always the disconnected state so the use can remove the devices.

Change-Id: Icdeb1e314eef0e5b1553decfc728e4b9eab939ab
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-11-29 11:02:49 +01:00
Fawzi Mohamed
4d84cd658f ios: ensure that simulator is always redy to use
Change-Id: Idafe728642e8c0c0637b8793e912178fdc011aa0
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-29 00:58:00 +01:00
Fawzi Mohamed
82d5b01268 Revert "ios: disable run button while an application is running"
This reverts commit 96ecfb9e4a500837e048cf29a89fe52d31ec1db9

device changes at the moment do not trigger projectexplorer's slotUpdateRunActions so this reduces the usability if one starts out without device.

Change-Id: I9fc4ba14ce45d5000d0a8af5c06e0ca9b3080d86
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-29 00:51:31 +01:00
Fawzi Mohamed
f6542e2abe ios: disable run button while an application is running
Task-number: QTCREATORBUG-10670
Change-Id: I23b553984b2c1848983299613004cbd910dc92dc
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-28 21:23:38 +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
Eike Ziller
add1869100 Fix settings category icon for iOS
It had wrong size, leading to wrong margins.

Change-Id: Ie107c396edba49fd6afa86535380a4cc5dc81252
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-26 11:28:32 +01:00
Fawzi Mohamed
7458a8235a ios: do not stop in debugger when debuggings an app
the attached process is seen as still running just after the attach
and continuing fails, immediately later a spontaneous stop is
detected and on ios (where we set continueAfterAttach) we
continue after the spontanous stop.
This also work in the desktop case.

Change-Id: I92fbcd3ba319da7d9e664f67c8cbbea00f0daa43
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-21 16:42:02 +01:00
Orgad Shaneh
4442a92729 Braces cleanup
Change-Id: I8413252c90a1487d291f15d92837c30ab697b245
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-14 08:13:52 +01:00
Fawzi Mohamed
6fc21884ca ios: remove empty action from simulator
Task-number: QTCREATORBUG-10705
Change-Id: Ie5c1e94a012cbdfb7cc69a3430fcad3c779e8bbe
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-12 12:05:28 +01:00
Fawzi Mohamed
34b875e107 ios: avoid adding toolchains that we don't use in the kits
Change-Id: Ic6f13dea277500fc9d3c3fb3b08069998d4b65ce
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-12 12:03:58 +01:00
Robert Loehning
bf0e6ee567 Fix case of "iOS"
Task-number: QTCREATORBUG-10681

Change-Id: I2a51eb95f8f9fa00114a2a9100eec5d052d2cca5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-07 14:22:08 +01:00
Fawzi Mohamed
b4785dde11 ios: codestyle fix
Change-Id: I276e382f98f2851c489e8c5b5a682f7a57e80c7f
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-06 12:57:41 +01:00