summaryrefslogtreecommitdiff
path: root/src/plugins/qnx/qnxdeviceconfigurationwizard.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Qnx: Update copyright informationEl Mehdi Fekari2013-10-161-2/+2
| | | | | | Change-Id: I10e5f7b4c9d0d527f8df34aa425a2a0bdaac5243 Reviewed-by: David Kaspar <dkaspar@blackberry.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* Unify wizards with TOC and cancel button.Eike Ziller2013-10-091-1/+1
| | | | | | | | | | | | QTBUG-28385 is biting us over and over (QWizard doesn't have close button nor cancel button on Mac in Qt 5), and actually there's no reason for us having a wizard without the features from Utils::Wizard. Task-number: QTCREATORBUG-10346 Task-number: QTBUG-28385 Change-Id: I80c0d82fe6738496c2ac03c31a1c2757ade8e266 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Device support: Make device testing a "well-known" concept.Christian Kandeler2013-07-021-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This entails the following: - Rename AbstractLinuxDeviceTester to DeviceTester and move it up into ProjectExplorer. The class stays unchanged, as there was nothing Linux-specific about it. The same goes for the associated dialog. - Move the createDeviceTester() function from LinuxDevice to IDevice and introduce IDevice::hasDeviceTester() to enable generic code to make use of this feature. - Move device testing out of the list of opaque device-specific actions; instead, the device settings widget now uses the device tester directly, if applicable. Rationale: - Device testing, just like remote process listing (if not more so), is a general concept that implementors of device classes will probably want to implement (and they should be encouraged to do so). Without the mechanism provided here, they would all need to put basically the same code into the actionIds(), displayNameForActionId() and executeAction() functions. This patch is the natural extension of b90e3bbd8bea27ad915a4d9033e0d5bda26f5667. Change-Id: I94f2badb4ceeda9f5cd3b066c13626bb4f65505d Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* SSH: Implement and make use of RFC 4256.Christian Kandeler2013-06-201-1/+1
| | | | | | | | | | | | | | | | | | | There is now at least one Linux distribution (openSUSE 12.3) that disables the "password" authentication method in its default sshd_config, while others allow it, but disable "keyboard-interactive". This patch tackles the problem as follows: 1) Implement RFC 4256 ("keyboard-interactive") and make this method available in the API. 2) In addition, the API offers to try both password-based methods one after the other, until one has succeeded or all have failed. 3) Dialogs continue to offer just the choice between "Password" and "Key", as to not confuse users. Internally, "Password" uses the feature described in 2). Task-number: QTCREATORBUG-9568 Change-Id: Ic81bd5d2dc4b1332ea1a8be938c19811c21a9087 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* QNX/RemoteLinux/Madde: Made device test more genericTobias Nätterlund2013-05-311-3/+1
| | | | | | | | | | | | | | | | | Any device inheriting from LinuxDevice can now implement a createDeviceTester() method to return their own AbstractLinuxDeviceTester that runs when the device wizard is completed, or when the Test Device button is pressed. The MaddeDevice implementation of the device actions now completely matches that of LinuxDevice, so those are removed. The QNX device check was improved with additional tool checking. Change-Id: Ie761b7cfc5591238aa2a18a74fe1843fb2cdbeaa Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/usr/bin/env ruby Dir.glob('**/*.cpp') { |file| # skip ast (excluding paste, astpath, and canv'ast'imer) next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i s = File.read(file) next if s.include?('qlalr') orig = s.dup s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m| res = $& if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces res else res.gsub!('} else', 'else') res.gsub!(/\n +} *\n/m, "\n") res.gsub(/ *{$/, '') end } s.gsub!(/ *$/, '') File.open(file, 'wb').write(s) if s != orig } Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc Reviewed-by: hjk <qthjk@ovi.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-051-20/+18
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessageloghandler.h src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/madde/maemodeployconfigurationwidget.h src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentinfo.h src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/ichecklib_global.h tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h tests/manual/ssh/tunnel/tunnel.h Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
| * Adjust license headershjk2012-10-051-20/+18
| | | | | | | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | SSH: Add infrastructure for passing additional connection options.Christian Kandeler2012-10-041-1/+1
|/ | | | | | | | So far, the only option is whether to use the default proxy or not. More will follow. Change-Id: Icd1ec407a0269cc8e7577901853d3873fd03015c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Device support: Introduce IDevice helper classes.Christian Kandeler2012-08-021-2/+0
| | | | | | | | | | | | | These are for configuration of process and ports gathering activities, respectively. This couples related functionality more tightly, while keeping the number of IDevice methods at a reasonable level. For ports gathering, the patch also adds the ability to configure both the command and the parsing function; the latter used to be hardcoded in the PortsGatherer class. Change-Id: I1b8940397a51efa7ddc05dd15cf861777d118c1a Reviewed-by: hjk <qthjk@ovi.com>
* remotelinux: rename LinuxDeviceConfiguration to LinuxDevicehjk2012-08-011-5/+5
| | | | | Change-Id: I7e8a99d3339d2040a23e4e78816b13b57197dcdb Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* debugger: move startgdbserverdialog from remotelinux pluginshjk2012-07-311-1/+0
| | | | | Change-Id: Ic382437bb99fe1b6bda9b1252e286cb3b9476191 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* remotelinux/projectexplorer: move UsedPortsGatherer to projectexplorerhjk2012-07-311-1/+1
| | | | | Change-Id: Iafd7f109de3076375e667aff0c429405cef07b55 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* madde/qnx/remotelinux: adjust after profile changeshjk2012-07-261-2/+3
| | | | | | | | | | | More Profile use, less dependency on QtSupport, Derive qtVersionId from profile instead of qt build configuration. Replace qt4BuildConfiguration with buildConfiguration. Use IDevice base class in AbstractRemoteLinuxApplicationRunner and in other places. Simplify remote linux runconfiguration Change-Id: I6414d3d8146d16c360b3a0465c57a052ea71f899 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* New QNX plugin.Tobias Nätterlund2012-07-131-0/+90
This plugin adds support for cross-compiling, deploying, running and debugging on a PlayBook or QNX Neutrino device. Change-Id: I0da7ccee40bd7ce4c0d6bdc6884d48ef23167dac Reviewed-by: Daniel Teske <daniel.teske@nokia.com>