summaryrefslogtreecommitdiff
path: root/src/plugins/ios
Commit message (Collapse)AuthorAgeFilesLines
* Introduce Profile build modeUlf Hermann2015-10-202-0/+2
| | | | | | | | | | | | We define a Profile build to be a Release build with separate debug info. You can thus change a given build from Release to Profile of vice versa by toggling the separate debug info checkbox. The messaging for future user interaction about Profile builds has to take this into account. Task-number: QTCREATORBUG-14009 Change-Id: I62a5b13993b20bf36329b1eefa8b1b6096f31644 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* iOS: Refactor iOS tool chain and kit auto detectionEike Ziller2015-10-195-288/+250
| | | | | | | | | | | | | | | | | | | It was all done in one huge, unreadable method. The refactoring along-side fixes the following: - iOS tool chains were demoted to manual at start up because there was no tool chain factory that would auto detect them - a QTC_CHECK failed because single Qt Versions could appear multiple times in the architecture->Qt version map, because each architecture is present in two abis (32-bit and 64-bit) The refactoring also removes unneeded automatic conversion from non-iOS Qt version to iOS Qt version, and removes considering GCC toolchains (which were not handled anyhow, because only Clang "platforms" were considered). Change-Id: Ic9ae797646f159ed45959fc797990aa98f2136fb Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-10-071-1/+18
|\ | | | | | | Change-Id: I4d74ad26046136ff2d38cfc1015b502009b2b344
| * iOS: Do not hardcode Qt version in iOS kitsEike Ziller2015-10-011-1/+18
| | | | | | | | | | | | | | | | | | | | | | Since Qt installers nowadays (since Qt 5.3) register all Qt patch releases of the same minor version with the same ID, the Kit will not be updated (because the Qt 'is the same'), so it should use %{Qt:Version} instead of hardcoding the version. Change-Id: Ieb8b766490b3c6297fa11802c6e13724658795d5 Task-number: QTCREATORBUG-15128 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | Utils: Remove qPidToPid() adapter functionhjk2015-09-168-13/+13
| | | | | | | | | | | | | | | | Since Qt 5.3, there's a QProcess::processId() providing direct access. Change-Id: Ia9c143c7a92ec61d1aa36ff3f4670ba72a509634 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | iOS: Use some more Qt5-style connectshjk2015-09-116-55/+53
| | | | | | | | | | | | | | Safer to refactor. Change-Id: Ie909b695e7d1d7a473aba6bb39e6bdf0d5d24d85 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Tell the QML debug server exactly what services we expectUlf Hermann2015-08-175-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The services need to be loaded before the first QML engine is created. The first QML engine may be created before a client connects. When the JavaScript debug service is loaded the engine is put into interpreter mode as we don't support debugging in JIT mode. Profiling, however should be done in JIT mode, whenever possible. Thus, in order to avoid the loading of unnecessary plugins and to get better results from the QML profiler we tell the debug server which services we expect, even before the client connects. Qt 5.6 will support additional command line arguments to specify the services and this change uses them. Change-Id: I6dcee016c39995e9adada6eaf0e39d8299c9b7e7 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com>
* | Ios: Add missing "override" modifiers.Christian Kandeler2015-08-172-3/+3
| | | | | | | | | | Change-Id: I9d57222f86af8ecbdc0d6d7969c14da523a198be Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Ios: Remove some unneeded references to QmakeProjectManager.Christian Kandeler2015-08-106-29/+3
| | | | | | | | | | | | | | Includes, namespace usings and casts. Change-Id: Iaa9caa1387f1f96fa5d8537d8cfec78ab9786789 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-08-042-28/+22
|\ \ | |/ | | | | Change-Id: I7b3ef276d438ff0f184a649153e8aeec08a9f8c9
| * iOS: Fix kit creation with Xcode 7Eike Ziller2015-08-041-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 7's platform plist does not specify a concrete version for the SDK in the SDK name anymore. So, if we do not find an SDK with the same name, look for an SDK with a version that matches the platform's 'Version' setting. Trying to figure out from the settings looks inherently fragile to me though, and we might be better off just using xcrun -sdk <sdk> --show-sdk-path Change-Id: Ief45f03aa7cd5193f6c24b087eb635d3f5ba5298 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
| * iOS: Do not drag unused QSettings objects around.Eike Ziller2015-08-042-25/+12
| | | | | | | | | | Change-Id: I5f641ba713e11c7a5376f94babf745f35ccbdba2 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | Rename toolchain type constants in ProjectExplorerTobias Hunger2015-07-142-5/+5
| | | | | | | | | | Change-Id: I56f5b7373846bb091456c050eb1ff3495ca2dd72 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | ToolChain: Get rid of type() in favor of typeId()Tobias Hunger2015-07-142-2/+4
| | | | | | | | | | Change-Id: I8fc68c266acb55a7c3e014697a7b526784914f7a Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | ToolChain: Turn id into a QByteArrayTobias Hunger2015-07-091-3/+2
|/ | | | | | | | That should take a couple of bytes less to store. Make sure this change is invisible to the configuration files. Change-Id: If5e73b52493c9164de9e342021d8153d274b350f Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* PNG: Run pngcrush on images with iCCP or sRGB profilesTobias Hunger2015-07-032-0/+0
| | | | | | | | This quietens warnings from libPNG during startup and shrinks the image sizes. Change-Id: Ieb4cb5e8ba30b99653896e283c2fb2cc267257f2 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* ProjectExplorer: Use Core::Id as RunMode "enum values"BogDan Vatra2015-06-304-10/+14
| | | | | | | | | | | | | This provides a way for third-party plugins to implement run modes without the need to add a value to the central enum or using manual workarounds like RunMode(*(int*)&someUniqueObject). Instead of centrally defined enum values this uses Core::Id that could be defined anywhere. Change-Id: Ic350e3d8dbb8042c61b2d4ffec993ca151f53099 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Debugger: Continue DebuggerStartParameter cleanuphjk2015-06-261-20/+5
| | | | | | | | | | | | | - Move sysRoot, debuggerCommand, targetAbi to DebuggerRunParameters, they are always the one coming from the kit. - Move projectSource{Directory,Files} to DebuggerRunParameters, they are alway coming from the runConfiguration's project - Pass RunConfiguration always as separate parameter, that's what related code does. Change-Id: I9965a052237af53fa2d170701bc88b552cab12ed Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Analyzer: Replace StartMode with a useStartupProject booleanhjk2015-06-171-1/+0
| | | | | | | | | | | | | This is what it is on the top level. The change makes it obvious that in the valgrind(-derived) plugins the value is later wrongly used to make a decision on whether to run the valgrind process locally or remotely. But that's isolated in valgrind now and can be fixed there. Change-Id: I6fa5e669dec1f9e2cdebe42a1591d15144082a21 Reviewed-by: Anton Kreuzkamp <anton.kreuzkamp@kdab.com> Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* ios: s/Q_DECL_OVERRIDE/override/gTobias Hunger2015-06-0417-134/+134
| | | | | Change-Id: I34749159abb7c48172a093037a4de800fabcecd2 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Use free Debugger::createDebuggerRunControl() functionhjk2015-05-291-2/+1
| | | | | | | | | | | | Allows us to un-export DebuggerRunControlFactory in an attempt to slim down the publicly visible Debugger plugin interface Change-Id: I0c2e7351ffa7a9d16586172816635be8ff40172e Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: David Schulz <david.schulz@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* iOS: Fix detection of device information for older XcodeChristian Stenger2015-04-211-1/+1
| | | | | | Task-number: QTCREATORBUG-14072 Change-Id: Ia69aebcb4183ccca7ce8d2332b1482cbefba00a7 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Don't allow to run static libs.BogDan Vatra2015-03-231-1/+1
| | | | | | | | Static libs can't be run on Android and on iOS, so we need to filter them out. Change-Id: I90b778ffaa5e7d6267cc0e8d753be56bf93007a7 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* Remove some duplicate includesTobias Hunger2015-03-201-1/+0
| | | | | Change-Id: If7bae084cd34c6fb0fe77f9227d9848517c0e691 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Clean exported headers of the Debugger plugin.Friedemann Kleint2015-02-261-0/+1
| | | | | Change-Id: I70ca6773e0f6aa6d80a441f8920d7f5d2418e1bf Reviewed-by: hjk <hjk@theqtcompany.com>
* qbs build: Introduce convenience project property sharedSourcesDir.Christian Kandeler2015-02-181-1/+0
| | | | | Change-Id: I69aacc7391e6e25e66eae1fb54b3c1cfb18679ee Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* ProjectExplorer: Use FileName for Node::pathOrgad Shaneh2015-02-133-15/+16
| | | | | | Change-Id: I4a41cfb629be8bb06b4b0616cd4475525e617a51 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-1252-310/+310
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1652-310/+310
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Debugger: Pass RunControl in DebuggerStartParametershjk2015-02-101-1/+2
| | | | | | | | | | | | | | .. to simplify DebuggerRunControlFactory::doCreate() call. Change-Id: I4dd0c224968bb8a388ea7f095b940b66ee606ab1 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | IOS: Remove unneeded qualificationsOrgad Shaneh2015-02-0513-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Replace QFileInfo::fileName() with FileName::fileName()Orgad Shaneh2015-01-291-1/+3
| | | | | | | | | | Change-Id: I4852ff215abf25649fc5eac1e922ae901839ca3d Reviewed-by: hjk <hjk@theqtcompany.com>
* | DeployConfigurationFactory: Properly extract the abstract classDaniel Teske2015-01-132-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | Make DeployConfigurationFactory a true base class. Introduce the DefaultDeployConfigurationFactory as the implementation that actually creates DefaultDeployConfigurations. This mostly moves code around. The virtual canHandle method was mostly unused and was removed from most classes. Change-Id: I170d94c648e67f3fe52a76ffb5344f389ae49efc Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | Debugger: Make DebuggerEngine internalhjk2014-12-152-18/+8
| | | | | | | | | | | | | | | | | | | | Expose less of debugger internals to the device plugins. Change-Id: Ie78756b033fae3fe02bff92eadf26b7319990605 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* | Merge remote-tracking branch 'origin/3.3'Eike Ziller2014-12-104-6/+9
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/projectexplorer/projectexplorer.cpp src/shared/qbs Change-Id: I6d91042bb48314d00be721099aed19feca74e0ce
| * ios: fix kill when running on deviceFawzi Mohamed2014-12-031-1/+2
| | | | | | | | | | | | | | | | 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>
| * iOS: do not set simulator type before initial setupFawzi Mohamed2014-12-023-5/+7
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/3.3'Eike Ziller2014-12-011-3/+6
|\ \ | |/
| * ios: ensure that device and simulator scan with a developerPathChristian Stenger2014-11-261-3/+6
| | | | | | | | | | Change-Id: Ifcc8d8f5c389c963ee1b6c2d2d2437bd5429f843 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>
* | Merge remote-tracking branch 'origin/3.3'Eike Ziller2014-11-2611-95/+313
|\ \ | |/
| * iOS: fix simulator selectionFawzi Mohamed2014-11-2511-95/+313
| | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/3.3'Eike Ziller2014-11-121-2/+0
|\ \ | |/ | | | | Change-Id: I0ab4982e229d475b8e3575414b4bebbfea07498d
| * qbs build: Remove unneeded import statements.Christian Kandeler2014-11-101-2/+0
| | | | | | | | | | | | | | The respective items are available without it. Change-Id: Idc840cf08e7bec84f561c096afe8de25b1fb8468 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.3'Eike Ziller2014-11-065-6/+6
|\ \ | |/
| * Introduce and use FileName::exists()hjk2014-11-034-5/+5
| | | | | | | | | | | | | | | | This can use the faster route through QFileInfo::exist now. Change-Id: Idb41b5d5185d7f02eacba498fb01f483d95e8d57 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
| * Use QFileInfo::exist(f) instead of QFileInfo(f).exists() if possiblehjk2014-11-031-1/+1
| | | | | | | | | | | | | | | | Faster. Change-Id: I91aa67462e11ff3258600d7f158de79942d0dc81 Reviewed-by: Marc Reilly <marc.reilly@gmail.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Make a few simple changes towards 64-bit iOS support.Jake Petroules2014-11-051-5/+12
|/ | | | | Change-Id: Ia931f98f6f155a619b9d3efa5777d0c30e62adac Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
* Normalize connect()sRobert Loehning2014-10-212-4/+4
| | | | | Change-Id: I27fee97c2837210d91948cc02f56cc5f6e6b19a2 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Debugger: Consolidate RunControl creationhjk2014-10-202-3/+3
| | | | | | | Export factory, de-export plugin, to remove one indirection Change-Id: I13a46460d07d5ded6b26f2b5ceccd01142fb10e8 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
View Lorry Controller Status