Commit Graph

35 Commits

Author SHA1 Message Date
Friedemann Kleint
239810eb7c QNX: Add explanatory Linguist comment about QCC being a compiler.
Change-Id: Iddec6dabcefe7757d174e0f881321024caac3516
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-15 17:12:32 +02:00
David Kaspar
94b8695575 Qnx: Fixing debugging on simulator to use correct debug symbols
BlackBerryConfiguration class has been rewritten to generate kit,
qtversion, toolchain and debugger for each available
<QtVersion,Architecture> pair.

This allows to use proper debug symbols i.e. target/qnx6/x86 for Simulator.

All kits, qtversions, toolchains and debuggers are claimed to be
autodetected.

Note it still requires to have matching version of the BB NDK Target and
simulator/device OS Image for proper debugging.

Task-number: QTCREATORBUG-10271

Change-Id: I522b761e7ad5c24736a8d19e0a1c8ea8c9fe9664
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
2013-10-15 16:29:40 +02:00
Leena Miettinen
4aeedd4ded BlackBerry: fix UI text capitalization and punctuation
Reword an info message to fix a language issue.

Change-Id: I42719b2c407c42aad811370dbde8e9d422b7a4bb
Reviewed-by: Alejandro Exojo Piqueras <suy@badopi.org>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-10-10 09:34:59 +02:00
hjk
394045b218 Debugger: Export Debugger::DebuggerItem to fix BlackBerry setup
Task-number: QTCREATORBUG-10189
Change-Id: Icddd09a1a931371133a1d03ca8cf600e76295eac
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-25 14:45:04 +02:00
David Kaspar
ebb787cda9 Qnx: auto-detected BlackBerry kits have mutable Device field
Change-Id: Ie6881e6521b27926b0dd59800c61d9909709ccc0
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Fanda Vacek <fvacek@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
2013-09-20 16:27:55 +02:00
Tobias Hunger
f1f1f65f7c Kits: Simplify handling of sticky kit information
Change-Id: Iff01445d1251487bd44c227de36f1b47ba4c3d42
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-12 18:46:20 +02:00
Thomas Zander
eea64bea49 Fix copy/paste, check both Qt versions.
The Blackberry plugin could give an error due to a copy/paste
issue which checked one item twice.

Change-Id: Icc3d10cda0a6e17088445c9feba862fd2d468b70
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-09-06 16:56:13 +02:00
hjk
cd17a0e400 Debugger: Don't add invalid items during validation
Change-Id: I3b6427ec038d61ea3166880ae51292f87f7b861b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-05 10:52:51 +02:00
Friedemann Kleint
dc108bc31f Replace QObject::tr() by tr-functions.
Change-Id: I2e3867b682db971662250c04dec609fd4e3817ea
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-04 16:30:42 +02:00
Daniel Teske
f214011d33 Kit: makeSticky() -> setSticky(), allows for unsetting sticky bit
Change-Id: I6aa7d7d52b681ee61d27c2d98e6fefe9cfd9532b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-03 12:18:29 +02:00
Friedemann Kleint
1226400af3 Introduce an enumeration for toolchain autodetection.
Replace boolean "autodetect" by an enumeration with a value
AutoDetectionFromSettings indicating whether the Autodetection
originates from a settings file. Enable the "Remove" button for
those cases.

Currently, there is no way to remove toolchains that were once
autodetected and are no longer present. This happens for example
when working in different MinGW environments, which then
clutter up the toolchain options page and dramatically slow
down the options page opening since gcc is launched to query
the flags, etc.

Change-Id: I731168d8694fe56f60d909f9779f83cffa55fd44
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-03 11:32:33 +02:00
hjk
0ed9b97a1f QtVersionManager et al: Code cosmetics
Apply static 'pattern' for QtVersionManager, de-noise using code.

Change-Id: Id66ac90094cd7312d1e72abbdbce4c02b078456e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 10:54:16 +02:00
hjk
e4b2947c6f ProjectExplorer et al: Code cosmetics
Apply static 'pattern' for ToolChainManager, de-noise using code.

Change-Id: I196dc6f39dc2c61b1783aecad3faa0b23849e00a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-29 16:45:25 +02:00
Mehdi Fekari
01ebbe19ba Qnx: Support multiple BlackBerry target configurations
The new bbndk 10.2 is based on multiple targets (based on multiple bbnk-env scripts).
There is no default/common bbnk-env.sh file anymore, and an NDK directory may contain
various bbndk-env scripts (i.e targets).

This patch makes the BlackBerryConfiguration based on the bbnk-env script path
rather than on the NDK path. This will enable having multiple configurations
per targets in the same NDK directory.

N.B: NDKs 10.1 with one default bbnk-env file are still supported.

Change-Id: Icec57c6e722caec7e5ff81e3a9ce4d2cf11f249a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-08-27 14:22:17 +02:00
Tobias Hunger
1b4b6ed6ca Kit: Use FileName for icon path
Change-Id: Ica6cf20c4ae1c7d58386d4970e468a105a3263b3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-23 10:18:55 +02:00
Tobias Hunger
95859289b8 KitManager: Use static API as other singletons do
Change-Id: Ia49c6552a5aae72870687ef9c64f2642fbe24155
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-21 16:55:16 +02:00
Mehdi Fekari
87b1ea2af7 Qnx: Properly call makeSticky(kit) interface
Change-Id: Ib72bc1e9ced522fca702308250cc5c8f7259d4f2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-25 12:15:35 +02:00
Mehdi Fekari
7b313e9696 Qnx: Refactor BlackBerryConfiguration
Improve the NDK setting page to enable managing multiple NDKs.

* Refactor BlackBerryConfiguration to support multiple configurations
* Add auto detected kits for installed NDKs
* Add/Remove manual NDKs

Change-Id: Icbc850551da3f729ccaa3473da720ade3051adaf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
2013-07-24 18:20:23 +02:00
El Mehdi Fekari
10f2e59aed Qnx: Add BlackBerry kits for qt5
Qt5 is available in the internal 10.2 NDK builds.
N.B: This is for testing purpose (internal developers).

Change-Id: I0858e05f5902d602a0f921ed22f34b79d557a10a
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-07-04 14:14:06 +02:00
El Mehdi Fekari
6b2162f2a9 Qnx: Move the dataDirPath() method to QnxUtils class
Change-Id: I6bc02a83263da4ce01fe3238aefee20a68507595
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-06-24 23:03:01 +02:00
hjk
8390a32131 Settings: Simplify some user code
This is still way too much boiler plate code for the task at hand.

Change-Id: Ia03bff3d6947ea6372e3f5d0217c116728742b74
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-29 09:40:17 +02:00
Leena Miettinen
6a29734714 UI text: fix caps and punctuation in QNX text
Change-Id: I5f09a1275806b93f777b6f6e8ebb3cad9cf1fa05
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-05-23 14:46:38 +02:00
Rafael Roquetto
8d25becfa9 BlackBerry Development Environment Setup Wizard
This wizard tries to make the process of setting up a new development
environment for BlackBerry devices easy. It does not implement anything that
isn't already available through the BlackBerry category under the "options"
menu, and also imposes some restrictions for the sake of simplicity.

It will:

* register CSJ keys
* create developer certificate
* create SSH keys to a default location
* request a debug token
* upload a debug token to the device

Change-Id: I063ee107fb474135523cf685b7ac5d05096ef741
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-13 15:11:10 +02:00
Tobias Nätterlund
9728afadb0 QNX: Improved generation of SSH keys for BlackBerry devices
The user is now asked where to store the generated SSH key,
before it is generated, and if that would fail, is still
enabled to select a different key.

Task-number: QTCREATORBUG-9101
Task-number: QTCREATORBUG-9102
Change-Id: I8e2f732dbcbe7bd3bd3fa9b512a7a195fa868c17
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
2013-04-30 07:35:09 +02:00
Eike Ziller
599be01a67 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
	src/plugins/qmldesigner/components/debugview/debugview.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
	src/plugins/qmldesigner/components/navigator/navigatorview.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
	src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designmodewidget.cpp

Change-Id: I9d8126e88397c02a87b5e4ab4da44e2bc7089134
2013-03-26 13:09:43 +01:00
El Mehdi Fekari
f409fdd6d3 Qnx: set icon for BB10 Kits
Task-number: QTCREATORBUG-8966

Change-Id: Ib5a43de526c652828d164a98342cb38edd266698
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-26 10:59:35 +01:00
Friedemann Kleint
056e8aa4c2 Fix some Krazy warnings about non-const ref iterator.
Change-Id: I1c78f5f5a7174002cd25bea109d5fe795530cdb5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-11 17:31:07 +01:00
Tobias Hunger
776f078d53 BB: Fix possible crash in settings page
Change-Id: I78b3f97c36e713d51246d0093db3448aea0991ae
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-20 17:48:03 +01:00
Rafael Roquetto
41bdf34275 Initial implementation of BB key management
Change-Id: Iba9c264b6c5809a0714da69591248fc2962c6526
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-14 16:38:06 +01:00
Friedemann Kleint
4402d7dab0 Fix configuration error messages in QNX.
- Remove newline character from translated strings.
- Add punctuation.
- Use GDB instead of Gdb.

Change-Id: Iabb36378640fc50580771134c4adf0094542b704
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-02-12 12:38:10 +01:00
Robert Loehning
a040424d2a Incremented year in copyright info
Change-Id: Ia11f4d7a94465de7f12cc390855e54e3256e5455
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-02-01 09:19:26 +01:00
Friedemann Kleint
9d29b251e7 Fix spelling/blank errors discovered by the bots.
Change-Id: Id6b25e288ce4fe4299644f77db65911082e76262
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-29 15:50:27 +01:00
Friedemann Kleint
719d227bba tr()-Fixes in QNX plugin.
Fix capitalization of message box titles, fix some message to
be in line with QtSupport.

Change-Id: I6ff2b930fa8e10ef164588d76ff233e1e57ae63f
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-29 15:06:00 +01:00
Mehdi Fekari
1860ace6b4 Qnx: Fix the sysroot path value on BB10 generated kits
Change-Id: Ie83e303a88a9e9f7e5a28ad91a6654624091e8ed
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-18 22:51:54 +01:00
Mehdi Fekari
37527b559c Qnx: Add a BlackBerry setup page to setup the plugin
Change-Id: I7a15f29d1b0d25f41c8bec7c907da7c60d59dcc1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-16 14:58:21 +01:00