aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/ios/iosdevice.cpp
Commit message (Collapse)AuthorAgeFilesLines
* iOS Device: Show some more information in device optionsEike Ziller2020-07-131-12/+48
| | | | | | | | | Show iOS device name, identifier, OS version and cpu architecture. Task-number: QTCREATORBUG-23016 Change-Id: I5fff2986a173800dabc585f17830cc242e436457 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* iOS: Fix slow debugger startup on devicesEike Ziller2020-07-131-0/+5
| | | | | | | | | | | | | | | | | | | We need to pass the path to the device symbols, that Xcode downloaded for the device's OS version, as the sysroot to the debugger. Otherwise debugger startup is very slow. We already tried to do that, but it looks like, depending on the devices, this path can contain an architecture specific part, e.g. "iOS DeviceSupport/13.5.1 (17F80) arm64e" instead of just "iOS DeviceSupport/13.5.1 (17F80)". It can still be just the latter, so we get the devices architecture information, try the architecture specific directory first, and fall back to the architecture agnostic name as before if the former doesn't exist. Fixes: QTCREATORBUG-21682 Change-Id: I2efdbfda0282f1cf0f8d10bd4e5217a298027fcf Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Core/Utils: Migrate further to Utils::Idhjk2020-07-061-12/+12
| | | | | | | | The coreplugin/id.h header is kept for downstream for now. Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66 (cherry picked from commit 430a33dcd9ac80ddb848e41f8f059102857c88aa) Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* De-Q_OBJECT-ify most DeviceFactorieshjk2020-01-231-3/+1
| | | | | | | | | | WinRt is the odd one out. Some were using setObjectName, but only used for debug reasons, not really needed. Change-Id: I4a370e4694443bc1c455fda4337ef3acfb9259b8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge remote-tracking branch 'origin/4.11'Eike Ziller2020-01-201-12/+31
|\ | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp Change-Id: I5e424e34db619bb769c7abc1e8651b7b40210839
| * iOS: Fix retrieving USB serial number with macOS 10.15 SDKEike Ziller2020-01-161-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | When building without explicit compatibility with oder macOS versions (-mmacosx-version-min), the Apple headers use a different value for the constant that is used to retrieve the USB serial number, and that just doesn't work for some reason. Make sure we use a value for the constant that works in all cases. Fixes: QTCREATORBUG-23460 Change-Id: Ie7de52a49a41c2ad33b2a6d2410414a9f1f05b1e Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * iOS: Guard against failure to retrieve device UIDEike Ziller2020-01-151-12/+21
| | | | | | | | | | | | | | | | It should not happen, but if it happens, Qt Creator should not crash. Task-number: QTCREATORBUG-23460 Change-Id: Id25b53ff24d7e1726efc344dc6318c32073ee75c Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* | Make various Q_LOGGING_CATEGORY's staticAlessandro Portale2020-01-151-1/+1
|/ | | | | Change-Id: I43d3a198b0863d85a7fb305c7cb768f68acbd139 Reviewed-by: hjk <hjk@qt.io>
* iOS: Put common IosDevice constructor code into a functionhjk2019-08-191-10/+9
| | | | | | | It is not even clear that the remaining difference are needed. Change-Id: Ic4418143242793d82a1f4c4c368af69a2e537078 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Base IDevice::osType on a data memberhjk2019-08-191-5/+2
| | | | | Change-Id: I969563e6e62895a51fb4692c8eb0bab278f0ecae Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer::IDevice: Add a default display nameChristian Kandeler2019-08-021-2/+2
| | | | | | Task-number: QTCREATORBUG-16281 Change-Id: Ieff929343b5dc3a84d9ecf5f4f0a032cb4ae4076 Reviewed-by: hjk <hjk@qt.io>
* Compile fix with recent Qt devhjk2019-07-291-12/+5
| | | | | | | | | The reasoning in 1b4766e26c6b did not take into account that the scope of QT_NO_JAVA_STYLE_ITERATORS may change over time, as done with f70905448f6 in Qt base. Change-Id: Ib1966ff26c4d36d5f62e149d6b45baa4aecf825d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ProjectExplorer: Make Device::displayType a data memberhjk2019-06-191-5/+2
| | | | | Change-Id: If650f660e3b10bc28d575ded07a854f59be26f87 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* iOS: Use base IDevice::clone() instead of local toMap/fromMaphjk2019-05-271-8/+4
| | | | | | | Some non-persistent data is handled in the base. Change-Id: I5f6c5429b88178115bf26f885b80fa3daebf227e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Ios: Fix typo in device factory creationChristian Kandeler2019-05-211-1/+1
| | | | | | | | | Introduced in 0c2101d816, but only started to cause problems since 555360c1d4. Fixes: QTCREATORBUG-22449 Change-Id: Id531d7cb94c80b762f7981cf3414348080d0d613 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ProjectExplorer: Use the fromMap(toMap()) pattern to clone deviceshjk2019-05-101-10/+4
| | | | | Change-Id: Ie6e73f5ef1019907dd311aac116d71f08b5a5202 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* iOS: Code cosmeticshjk2019-02-251-10/+0
| | | | | | | Remove unused functions and declarations, brace style, empty lines, ... Change-Id: I1afe90484879fa93bb1feaa25d12cd4794aa0234 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Move IDeviceFactory closer to IDevice implementationhjk2019-02-211-0/+22
| | | | | | | | | Except for the DesktopDevice, which is kind of special. Also try a bit to make (and partially fail at doing so) naming and code structure (#include, use of namespaces) more similar to each other. Change-Id: I9fe266e706b72c14f59ff03ca1ae02dba3adcc71 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Rename KitInformation to KitAspectChristian Kandeler2019-02-111-2/+2
| | | | | | | | | | | The name "KitInformation" does not properly convey the fact that it represents a certain *aspect* of a kit. The same goes for "KitConfigWidget", which in addition was inconsistent with "KitInformation". We now use "KitAspect" and "KitAspectWidget". Change-Id: I9804ee4cedc4d61fad533ea1dd4e4720e67fde97 Reviewed-by: hjk <hjk@qt.io>
* Help: Rename handleHelpRequest to showHelpUrlEike Ziller2019-01-251-1/+1
| | | | | | | Since that is what it does. Change-Id: I13ffe21cdb625a0df1313f2ff09bf84196f08768 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* ProjectExplorer: Introduce a setter for IDevice origin and idhjk2019-01-151-4/+4
| | | | | | | | | | | They are not completely orthogonal, so use one function for now. This is the step towards streamlining the IDevice::ctor/create lines of functions. Change-Id: I1fe9144c45c7da0c9dcbda3bf424e976e0519cd6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Use setter for IDevice::typehjk2019-01-141-6/+4
| | | | | | | | Second step towards streamlining the IDevice::ctor/create lines of functions. Change-Id: I8b0f2270a9f6545ff9419ef8cf44b456c2233223 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Use setter for IDevice::machineTypehjk2019-01-141-2/+2
| | | | | | | | First step towards streamlining the IDevice::ctor/create lines of functions. Change-Id: I44226f8a05902cadd40c8820ab67752070d186c0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Simplify IDevice extra device action setuphjk2019-01-141-17/+0
| | | | | | | Function objects are easy nowadays. Change-Id: Iec2b770b99d8f11b7a090fb3bd51af8aa60f6fe0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* iOS: ModernizeAlessandro Portale2018-11-131-13/+10
| | | | | | | modernize-* Change-Id: I64d2bb4320c9b444bc13e90099600628eac1f5a6 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Remove hard-coded disabling of debug logsOrgad Shaneh2018-10-131-1/+1
| | | | | | | | | | | Instead, set the default level of all logs to QtWarningMsg. The call to setFilterRules overrides the user preferences in qtlogging.ini. Change-Id: Id5f6cd550d14ff7f45ae04c5d3110e0bafb0f072 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Introduce a Utils::OsType IDevice::osType() functionhjk2017-06-281-0/+5
| | | | | | | | | | | | E.g. for easier construction of command lines in situations like if (isLocal()) runnable.commandLineArguments = argumentString(Utils::HostOsInfo::hostOs()); else runnable.commandLineArguments = argumentString(Utils::OsTypeLinux); Change-Id: I5a35304e5d1b5a042952201f39f4134a5cd0ce24 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Introduce IDeviceFactory::iconForId()Alessandro Portale2016-11-301-5/+0
| | | | | | | | | | | This adds the possibility to have an icon for a device type. Now, a Kit can have a proper icon if just the device type but not device is selected. Change-Id: I2a382ffd5b46cbbf74cdd0b934b3d450d300bfff Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Themable, HighDpi Android/iOS device iconsAlessandro Portale2016-09-271-1/+4
| | | | | | | | Also used as option category icons Change-Id: I40916ff4683554a3e7de7126d737286eba4a525f Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* ProjectExplorer: default icons for IDeviceAlessandro Portale2016-09-261-0/+2
| | | | | | | | | | | | | | Enable devices to define their default themable icon. Kit icons are now by default the Desktopdevice icon, overridable by the device icon of the kit's device, in turn overridable by an icon file path. KitManagerConfigWidget: The browse button for the Kit icon gets a "reset" action. Change-Id: I6328ba7d640393aee2c324c592e76b4d5430586a Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Ios: Use Qt5-style connectsOrgad Shaneh2016-06-301-6/+6
| | | | | | | The heavy lifting was done by clazy. Change-Id: I1b25f0108939d87e859d0407a35f75b88fa0edc3 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Use Utils::Port where possibleUlf Hermann2016-04-201-4/+4
| | | | | | | This solves the ambiguity between 0 and -1 being the "invalid" port. Change-Id: I3bac11dd4117bb1820fbd58186699925b73df1c5 Reviewed-by: hjk <hjk@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-121-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
| * Update LicenseEike Ziller2015-01-161-6/+6
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | IOS: Remove unneeded qualificationsOrgad Shaneh2015-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly done using the following ruby script: Dir.glob('**/*.cpp').each { |file| next if file =~ %r{src/shared/qbs|/qmljs/} s = File.read(file) s.scan(/^using namespace (.*);$/) { ns = $1 t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m| before = $1 char = $2 if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/ m else before + char end } if t != s puts file File.open(file, 'w').write(t) end } } Change-Id: I8ef73f4861069dcd7edf5e73b397d60609d4b476 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.3'Eike Ziller2014-12-101-1/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/projectexplorer/projectexplorer.cpp src/shared/qbs Change-Id: I6d91042bb48314d00be721099aed19feca74e0ce
| * iOS: do not set simulator type before initial setupFawzi Mohamed2014-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | The run configuration did try to set the simulator type for devices, and also before knowing the available simulators. Make most IosDeviceType initialisations explicit about the device type. Change-Id: I22b87bf4568e1af0c12b1fb91d3074bf29438db2 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
* | Catch exceptions by const reference.Christian Kandeler2014-11-281-2/+2
|/ | | | | Change-Id: Ic537fd123478a4f8fe4e54736d444fa64fd62d9c Reviewed-by: hjk <hjk121@nokiamail.com>
* iOS: fix simulator selectionFawzi Mohamed2014-11-251-1/+2
| | | | | | | | | get simulator type and SDK version dynamically from the available ones, and let the user choose which one to use. This fixes the static solution that did break with Xcode 6 Change-Id: I5cb2be68b9ea8736fc880cf3dd9d39d77f030293 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* ios: convert to new logging infrastructureFawzi Mohamed2014-07-071-22/+16
| | | | | Change-Id: Ia62a585acfb55c35aa859553d24cb0e20600b46a Reviewed-by: Kai Koehne <kai.koehne@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: remove temporary devicesFawzi Mohamed2014-03-111-5/+6
| | | | | | | | 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>
* ios: adding port information to ios devicesFawzi Mohamed2014-03-111-3/+24
| | | | | Change-Id: I0243735159b02ac4afaf3d14ecb20381439a3997 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* ios: detect switch usermode -> dev modeFawzi Mohamed2014-02-191-25/+40
| | | | | | | | | 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>
* ios: speed up device debuggingFawzi Mohamed2014-01-081-12/+3
| | | | | | | | | | 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>
* 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>
* iosdevice: guard detection handlers against foreign exceptionsFawzi Mohamed2013-12-021-47/+67
| | | | | Change-Id: I1f74aff3aa68cf8334ede232af61c85f3152adb9 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* ios: create devices in the disconnected stateFawzi Mohamed2013-11-291-2/+2
| | | | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 16:53:44 +0000