summaryrefslogtreecommitdiff
path: root/src/plugins/qnx/blackberrydeployconfiguration.cpp
Commit message (Collapse)AuthorAgeFilesLines
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* BlackBerry: Do not add bar-descriptor.xml to .pro fileTobias Nätterlund2014-03-141-111/+1
| | | | | | | | | | | | | | | | | The bar-descriptor.xml file will no longer be added to the .pro file as OTHER_FILES, as it was not necessarily the file listed in the .pro file that was used for creating the package later on, as that is configured in the deployment settings. Instead, the file configured in the deployment settings is now added to the file project tree, and kept in sync if the user changes the file to use for deployment. Task-number: QTCREATORBUG-10054 Change-Id: I3068fedf8ea17f4e60131f9106b3844086d1552b Reviewed-by: David Kaspar <dkaspar@blackberry.com> Reviewed-by: Mehdi Fekari <mfekari@blackberry.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* Fix messages in QNX.Friedemann Kleint2014-03-101-1/+1
| | | | | | | Change-Id: Id9199607e787a04a3c90596e30e5ca5f249e7f07 Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com> Reviewed-by: Mehdi Fekari <mfekari@blackberry.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* BlackBerry: fix UI text and messagesLeena Miettinen2014-03-071-4/+4
| | | | | | | | | Fix punctuation and capitalization in UI text and messages. Change-Id: Ie3beaeda820090ecec94832b773c2f29a7bd0d95 Reviewed-by: Mehdi Fekari <mfekari@blackberry.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Qnx: Show the .pro file when adding bar-descriptor to projectEl Mehdi Fekari2014-01-241-1/+2
| | | | | | | | | Task-number: QTCREATORBUG-11300 Change-Id: If064d79c35d95b1ea1c5124be60d22d2ffee93f4 Reviewed-by: David Kaspar <dkaspar@blackberry.com> Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.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>
* Rename plugins/qt4projectmanager to qmakeprojectmanagerhjk2013-10-291-3/+3
| | | | | | | This finally renames the plugin itself. Change-Id: Ibdf4f4b4e9776c2fdc809e0127f3e1310de44bd1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Qt4ProjectManager: Rename {Qt4,Qmake}{Project,Pr{i,o}FileNode}hjk2013-10-291-2/+2
| | | | | | Change-Id: I27139d8ccc17b665853bec4a37e80568680b5fcc Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* Qt4ProjectManager: Rename {Qt4,Qmake}BuildConfiguration{Factory,}hjk2013-10-291-1/+1
| | | | | | Change-Id: Id49e347cc448f6a28271b6af775d56b6e00b4908 Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Qt4ProjectManager: Rename the "normal" qt4* files to qmake*hjk2013-10-161-3/+3
| | | | | | Change-Id: I5e173900a4008c72c67a30eaa9c101027c1b43af Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* 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>
* Rename namespace Qt4ProjectManager to QmakeProjectManagerhjk2013-10-161-3/+3
| | | | | | | First step towards plugin renaming. Change-Id: I8ac017660a7aa2bda0d7bb7d72ab0cfceaf6cfd2 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Qnx: Remove dead codeTobias Hunger2013-09-121-1/+0
| | | | | | | Change-Id: I16aa29f1f45bd7094dbbfb00de4965d95a386f6f Reviewed-by: Mehdi Fekari <mfekari@blackberry.com> Reviewed-by: David Kaspar <dkaspar@blackberry.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Fix some include statements.Christian Kandeler2013-09-041-2/+1
| | | | | | | | In several places, it says '#include "..."' for headers from different libraries/plugins. Change-Id: I96cd74fef9b30163adefe3e1720e0847bed9553a Reviewed-by: hjk <hjk121@nokiamail.com>
* Qnx: Set the correct target name in the application descriptorEl Mehdi Fekari2013-05-211-1/+11
| | | | | | | | In some cases, when deploying an exising project, the project name is different from the target name set on the pro file. Change-Id: I558a128467eb12a6d9d3731f563276bb54a14326 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Merge remote-tracking branch 'origin/2.7'Oswald Buddenhagen2013-02-281-6/+15
|\ | | | | | | | | | | | | Conflicts: src/plugins/qnx/blackberrydeployconfiguration.cpp Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d
| * QNX: Remove BlackBerry specific Qt Quick wizardsTobias Nätterlund2013-02-191-6/+15
| | | | | | | | | | | | | | | | | | | | | | As the standard Qt Quick wizards can handle BlackBerry file paths for the QML files, and the BlackBerryDeployConfiguration automatically sets up a bar-descriptor.xml file for the project, we can remove the BlackBerry specific Qt Quick wizards. Change-Id: I8866fb92c8b1725fb4d4ba7af6bdaa2e15986eb2 Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* | Qnx: Wait for user's confirmation to setup a bar-descriptor fileEl Mehdi Fekari2013-02-251-9/+20
|/ | | | | | | | | In some cases, the user does't need to package the project and the generated bar-descriptor is useless. Change-Id: I3f3336190939ef6ded405e3e0793a956cd0e15cc Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* QNX: Make the deploy information unique for each deploy configurationTobias Nätterlund2013-02-141-10/+2
| | | | | | | | | | | Without this fix, the deploy information was shared between configurations, causing e.g. BAR packages for a device to be overwritten by BAR packages for the simulator. Change-Id: I6b74ba355363060ef53dceac478f0aff0f60c38b Reviewed-by: Mehdi Fekari <mfekari@rim.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* UI text: edit QNX messagesLeena Miettinen2013-02-121-5/+5
| | | | | | | | Fix capitalization of UI text. Change-Id: I9fad22edb4151ba0a63738fdb5aafe9d60c5b051 Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@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>
* | Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-291-1/+19
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tips.cpp src/plugins/coreplugin/versiondialog.cpp src/plugins/projectexplorer/kitinformationconfigwidget.cpp src/plugins/qnx/blackberryapplicationrunner.cpp src/plugins/qnx/blackberrydeployconfiguration.cpp src/plugins/qnx/blackberrydeployconfiguration.h src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
| * QNX: Fixed bug where changes to BlackBerry deploy information wasn't savedTobias Nätterlund2013-01-211-1/+19
| | | | | | | | | | | | Change-Id: Ic295581062197221bdd00837b7cf426e709749ae Reviewed-by: Mehdi Fekari <mfekari@rim.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | QNX: Add bar-descriptor.xml to new project, and make sure it shows up in ↵Tobias Nätterlund2012-12-041-0/+2
| | | | | | | | | | | | | | | | project tree Change-Id: I41bc5f442977669120cf6b8a315d7bcf481b7f9d Reviewed-by: Mehdi Fekari <mfekari@rim.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* | DeployConfigurationWidget: Remove classDaniel Teske2012-11-161-1/+1
| | | | | | | | | | | | | | | | It is the same as NamedWidget. If we need to add additional functionality then we can always reintroduce the class. Change-Id: I684b5215e732e480e4e73e4cac3753bb92afd0d4 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Remove DeployConfigurationWidget::init()Daniel Teske2012-11-161-1/+1
| | | | | | | | | | | | | | It serves no purpose. Change-Id: Ic9d802aa2b46aae567c5a84d199d37564c69f7ed Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Rename DeployConfiguration::configurationWidget()Daniel Teske2012-11-161-1/+1
| | | | | | | | | | | | | | | | To createConfigWidget(). Which indicates that a new widget is created and makes it the same name as BuildStep/BuildConfiguration Change-Id: Ib1858bc5382556ebb9a8a474fa79f0e7e9593cf7 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Slim down BlackBerryDeployConfigurationDaniel Teske2012-11-161-24/+0
| | | | | | | | | | Change-Id: I24c6041fed850523135bc42a9cff768228046a80 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Qnx: Enable deploying existing Qt apps by adding the bar descriptor filemfekari2012-10-251-0/+73
| | | | | | | | | | Change-Id: I4a7f4f8b033ac11b5d43010b3a9f479802022c46 Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.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>
* | Make DeployConfigurations cloneableDaniel Teske2012-09-281-0/+1
|/ | | | | | | The API was there just not the correct implementation. Change-Id: I65468f3c00f3c8ba1b853f8c11f6296813d1a966 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* QNX: Fixed crashes when no BlackBerry device is selected in the kit usedTobias Nätterlund2012-09-051-0/+6
| | | | | Change-Id: Ic3059a0dd128bc66495f3288bbf1982f81d023d6 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* s/profile/kit/Tobias Hunger2012-09-041-4/+4
| | | | | | | | | | | | | | | * Rename profiles to kits. * Update some strings: * projects mode has a Kits tab, not a Targets tab. * " Settings" was dropped from the sub-tabs of the Kits tab * menu entry "Build/Open Build/Run Target Selector" was renamed to "Build/Open Build and Run Kits Selector". * Use "Kit" instead of "Target" in miniprojecttargetselector. (The class was not renamed as it does indeed select targets, not kits) Change-Id: I0727e086e2dfa0e8aaaf89fdc6f2e3596c7a4314 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* New QNX plugin.Tobias Nätterlund2012-07-131-0/+111
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>
View Lorry Controller Status