feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
46,172 Commits 108 Branches 368 Tags
eb17b224adc5367358e36d3b5c09e30f202857fa
Commit Graph

27 Commits

Author SHA1 Message Date
Eike Ziller
0c5bae640b Merge remote-tracking branch 'origin/4.0' 
Change-Id: I80bc3371c6d7cf9f2d46cbcf8e79e4761213d8aa
 2016-05-27 12:01:36 +02:00
Jake Petroules
b67b3160b6 iostool: Print ALL error messages recognized by MobileDevice framework. 
Task-number: QTCREATORBUG-16328
Change-Id: I45f8042dee4293bd40e204002c164eb99ac754df
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-05-27 09:38:12 +00:00
Vikas Pachdha
794165d5db Ignoring wifi interfaces as debugging over wifi is not supported 
Task-number: QTCREATORBUG-16061
Change-Id: Id7ee6e81246cd5e811a01ff787d73018970ce272
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-04-29 13:01:04 +00:00
Vikas Pachdha
a2e2db0051 Use secure apis and mount developer disk image on device 
Add code to find the developer disk image in xcode installation
based on the device version and build number

Change-Id: Ic05795ad9411ef0f3713c58dc9d286bf6ad1fa19
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-04-29 13:00:53 +00:00
Eike Ziller
c9af410a66 iOSTool: fix breakage with startService 
introduced by bb8f8b56f1

Change-Id: I6e1590bc84a139ab7e9ccfda0b160492b83750ff
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-04-25 14:21:40 +00:00
Eike Ziller
bb8f8b56f1 iOS: Better error messages for starting service and transferring app. 
Change-Id: I1d5e0102c87e43594c35f997c293d5b7a2e5e81b
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-04-19 08:21:11 +00:00
Tobias Hunger
1b4321279f Update License according to agreement with Free Qt Foundation 
* Update files in src/share* and src/tools

Change-Id: I78aa5d4a1d76212964e467de7676c1fcb2b777d6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 15:48:57 +00:00
Jake Petroules
b1f6974954 Improve error messages in iOS deployment tool. 
Change-Id: I94f945d1247a9d5d43119de2a53af33a7b1b25c7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-10-02 17:40:03 +00:00
Eike Ziller
f8596d6c63 iostool: add missing overrides 
Change-Id: I80e072c5bde4874b89a0af2e105e378674e8d9fe
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-10-02 14:42:38 +00:00
Jake Petroules
d47e790d67 Use built-in QString/CFString converters available since Qt 5.2. 
Change-Id: I61d861b446299d5b6f43d283928644296b09ad41
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-09-28 07:27:57 +00:00
Tobias Hunger
68970e9d96 iostool: s/Q_DECL_OVERRIDE/override/g 
Change-Id: I05e269b56bcdc3e4555116a584c2efaaccced6e5
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-06-04 08:31:06 +00:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Fawzi Mohamed
a1076c209a ios: fix kill when running on device 
Change-Id: I2bd9a461c055ef8aa5f5ed9facc879def0078f6f
Task-number: QTCREATORBUG-13259
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
 2014-12-03 13:39:29 +01:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
 2014-10-14 15:36:16 +02:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Thomas Hartmann
48f19e925b Use Q_DECL_OVERRIDE instead of QTC_OVERRIDE 
This patch removes src/libs/utils/qtcoverride.h
and uses Q_DECL_OVERRIDE from Qt 5 instead.

Change-Id: I61ffa539648ffe996dc061eec7708c04580c0f09
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-09-25 12:16:47 +02:00
Christian Kandeler
847f10e9cc Remove Qt version checks. 
Qt 5.3 is the minimum requirement these days. Remove all fallback code
from sources and project files.

Change-Id: If6188a471197acadda4d6baee71804ba1a8026c6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-09-08 10:33:25 +02:00
Orgad Shaneh
5830cb0bdf iostool: Fix compilation with C++<11 
Change-Id: Id026a5f0223dff84568a2c2f3208a3e6eb5410fa
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-25 22:04:31 +01:00
Fawzi Mohamed
3bc986df44 iostool: support for qml debug and remote port forwarding 
Change-Id: Id45cc17df1cb941ad0e09ecb6d7936dacac24755
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-24 11:57:31 +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
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
5bc6f1e390 ios: wait 5s after sucessful deploy 
Ios 7.0.4 with xcode 5.0.2 seem to need a bit of time after installation
before running, otherwise the device might be locked up.
Task-number:QTCREATORBUG-10922s

Change-Id: I4d35d0c3b21407db7d0aa5f629d3fa51117d4ddd
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2013-12-04 14:11:20 +01:00
Fawzi Mohamed
416dca07ef iostool: avoid deploying when just running, improve app lookup 
-run now only runs
improved app path lookup efficiency (lookup only required info)

Change-Id: Ic32be229c997548eab4d63e43970d640c25a1abe
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2013-12-04 12:26:17 +01:00
Fawzi Mohamed
49b3e7a2ce ios: fix running/debugging with new version of MobileDevice.framework 
The version of MobileDevice.framework shipped with iTunes 11.1.3 and
XCode 5.0.2 does not support concurrent connections well, asking
for the application path while the connection to gdb was open would
lock up the device, and require a reboot.

Task-number: QTCREATORBUG-10922
Change-Id: I939cb9e75896e200da552d6708c01e726b9d7b45
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2013-11-29 00:14:35 +01:00
Fawzi Mohamed
b39f26e856 ios: device debugging 
switched to using a relay server

Change-Id: Ic3ddb48b818fa43894314f7fbaf9d7780fc01ade
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2013-10-31 18:19:09 +01:00
David Schulz
dd08503062 Ios: Fix compilation on windows. 
Change-Id: I90054041069d9aace6fc24f9094d46207b87e54e
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2013-10-14 15:55:48 +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