Commit Graph

20593 Commits

Author SHA1 Message Date
Orgad Shaneh
93a4108a0d Git: Emphasize detached HEAD on commit
Change-Id: I91dab02af501527489bf6268fe088bc8095bb321
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-04 11:28:50 +02:00
Orgad Shaneh
0ef2f65b0e Git: Do not fail on add branch when no tracking branch selected
Change-Id: Icf278e4969ca98a8081d6a12be08e61670c8dbaa
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-04 11:28:17 +02:00
Orgad Shaneh
284ab01d2b Git: Allow Checkout for remote branches
Change-Id: Ic1b402314c29c70a24d314ead674166839a61d42
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-04 11:27:43 +02:00
hjk
0af2934e48 debugger: add watchpoint option to memoryview context menu
Change-Id: I9511e15afcfe4664ae5077dd568e5a3637888e30
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-04 00:14:57 +02:00
hjk
48fcfe0b8d debugger: move watchpoint convenience functions to breakhandler
Change-Id: I7f214ff5fe6d996c4dd14c6ac181a482ad00c94e
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-04 00:14:41 +02:00
hjk
0394699a4c debugger: more modulehandler polishing
Change-Id: I2382a597783512b566118cccf772ff530cdf9026
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-04 00:14:04 +02:00
hjk
e6d4904a62 debugger: small rework of the modules handler
Use new elfreader, also slimmer interface.

Change-Id: Ie6387ff14bdefd109768d1ce4c395a17211da77d
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-01 19:16:14 +02:00
hjk
278d909208 debugger: use the elfreader instead of external objdump
Change-Id: Ic5c5525703a6ef8924ac68e1a9ed33e411aada08
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-01 19:15:59 +02:00
hjk
1e31ae2020 utils: add a simple elfreader to extract section names
Change-Id: Ia761b8d2150ff2c47a2e26c403a2b00127023d8b
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-01 19:15:43 +02:00
Leandro Melo
ca7ac8c035 C++: Fix macro uses line info
Make sure the environment line is consistent during preprocessor
directives and identifier handling so clients can rely on consistent
information. Particularly important for macro usages.

New tests also added.

Change-Id: I962a39a86cd17b8d945d2959c2c95e2d258ea3e6
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-01 14:28:03 +02:00
Eike Ziller
b7c34292f4 Merge remote-tracking branch 'origin/2.5'
Conflicts:
	tests/system/objects.map

Change-Id: Ie6aed14f2f61111d26498ff3684ea4a57e6da59e
2012-06-01 14:06:24 +02:00
Kai Koehne
b2f4679c20 Debugger: Remove 'Change Global Display Formats...'
Remove 'Change Global Display Formats...' from the Locals & Expressions
context menu. The dialog only works right now if one is currently debugging,
changes are not stored across runs ...

Change-Id: I7d16a7f8eaa9990e5fe1d7148022aa3db2c0fd05
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-01 13:42:20 +02:00
Nikolai Kosjar
d406b3cd1a IDevice: Introduce state 'device ready to use'.
A connected device might not be ready to use, so introduce another
state for this. The device settings widget is adapted to not only show
the icon, but also the state as string (the icon alone might not be
expressive enough).

Change-Id: I98d351b47a358ea59199e690e4b60f8030578ec6
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-01 12:55:42 +02:00
Christian Kandeler
a577cb2b62 RemoteLinux: Respect "no_deault_target" setting.
I.e. do not consider subprojects with that configuration for
deployment.

Change-Id: Ia04c8168480772ebf4026337ba0c81fba532f346
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-01 12:52:22 +02:00
Daniel Teske
69a7b5e824 SessionManager: Don't autosave the session while loading a session
Change-Id: I3ce769f9d9753b2771b349ad19a5b248a7f306d2
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-06-01 12:07:15 +02:00
Daniel Teske
a97d144a33 Start auto save session timer later and let it occur more then once
Fixes regressions introduced by f059018a8e

Change-Id: I9d590580a9d36ac6980a6d170a119ebe33819262
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-06-01 12:07:06 +02:00
Fawzi Mohamed
63f0a14fe5 zeroconf: add already prepared address strings to services
Change-Id: I16cfb5fd6a2c715760556ab9e14daf99941fcdd1
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-31 17:17:27 +02:00
Friedemann Kleint
7eb8a08c0b Debugger: Fix compile on Windows.
Change-Id: I4994fdfd260d80eec8a0bfda903c553d2d563706
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-31 16:38:59 +02:00
kh1
9eed55f3fb Change the font of the help, just size can be modified.
This is true for html files that are styled thru style sheets.
We could implement a workaround using jQuery and manipulate
the html/ css, but this is so slow that I won't do that.

Instead add a note and tell the user about the underlying problem.

Task-number: QTCREATORBUG-4871
Change-Id: Id3d0a490bb160825ec643f8c84871aad6cf1b796
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-05-31 16:18:01 +02:00
kh1
8d37120edc Fix font size was not applied at the first start of help system.
Used the wrong call to do this, there is a similar function that
should have been used.

Task-number: QTCREATORBUG-6762
Task-number: QTCREATORBUG-7195
Change-Id: Ic2317eda1c8d45006641b64507d08efb48e7e5a2
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-05-31 16:06:36 +02:00
Aurindam Jana
45540a30db QmlDebugging: Save few cycles
Change-Id: I6d094605e3983128b844f2156909b98a4016509f
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-31 16:03:28 +02:00
kh1
3a3433f7e7 Fix cannot add help file if other file of the same version was removed.
Task-number: QTCREATORBUG-6678

Change-Id: I21ac494d7d666ef43f612b7ef49b92954f535ae8
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-05-31 14:56:16 +02:00
kh1
e1e65f6e56 Skip calling set custom value if nothing has changed.
The call will trigger a setup of the local help manager,
which is rather heavy and should be avoided if possible.

Change-Id: I03fbe6a30fba6ac48361c7e2b5aa6d45dad5126b
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-05-31 14:55:58 +02:00
hjk
788772a23e debugger: work on watchmodel bulk insert
Change-Id: Ib92c8b02bc8e608810b3fa0f2d70d6547e428933
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-31 14:33:44 +02:00
hjk
f5c688cadc debugger: save a few cycles in the watchmodel
Change-Id: I56afd567361b2a65db4e0103a64540dc4305981c
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-31 14:30:07 +02:00
Christian Kandeler
ff584622f4 RemoteLinux: Add new deploy step that checks for free space.
Tool output in the "disk full" case can be rather unhelpful,
so we check in advance.

Change-Id: Ia3f5f0b456b91acf9a8f8e72de870e1df6ea8e80
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
2012-05-31 14:07:22 +02:00
Daniel Teske
f10d751466 Fix toolchainsoptions page memory leak
Change-Id: Idd36f3deb6b7932cbbabd4a38adac9e1ac3e00e0
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-31 13:33:49 +02:00
Eike Ziller
6026a4a51c Fix default ui language on Linux.
On systems where uiLanguages returns something containing "-"
(e.g. "de-DE", see QTBUG-25973)

Change-Id: Ibe2db6a7a6ed893795e3f3110b33c39225bed751
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-31 12:43:13 +02:00
Christiaan Janssen
651b9ff65e QmlProfiler: added tooltip for non-optimized bindings
Change-Id: I4500b168c016e7d5525124996be4886e481065d9
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-31 12:30:30 +02:00
Christiaan Janssen
bc9bb6ec69 QmlProfiler: renamed "v4" bindings to "optimized" bindings
Change-Id: I1821b966eeb5068f3f34dbab5ba10f81c8bebd5f
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-31 11:51:58 +02:00
Friedemann Kleint
1267f3fe44 Fix compilation with Qt 5.
No match for operator ==(QStringRef, const char *).

Change-Id: I37e365f08ab990c41ce9431558ad679a63acd952
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-30 16:43:18 +02:00
Tobias Hunger
468d7c32b6 DeviceFactory: Allow for querying supported device types
Allow to query the DeviceFactory for device types it can create as
well as the display names to use for those types. Also allow to
create any of the supported device types.

The MaddeDeviceFactory makes use of the information to set the correct
type in the wizard.

Change-Id: I8c05ecd467e5bb1b151a84a8d62ef98a57849605
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-30 15:54:38 +02:00
Aurindam Jana
efb1b7fc3b QmlJSInspector: Check for null pointers
Change-Id: I8d99b109909e596ead2e674eff0de576b2dca411
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-05-30 15:38:37 +02:00
Aurindam Jana
fc1f265e87 QmlJSInspector: Improve performance
Populating watchhandler can be expensive. Update
with just the necessary data.

Change-Id: I06c28e1c8f5437cc05d3f9cef139d3df9da10c81
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-05-30 15:12:20 +02:00
Friedemann Kleint
d65ac4bf0c Qt version options page: Replace (large) tooltip by details widget.
Remove the tooltip that has grown overly large for Qt 5
by a row containing a details text browser.
Filter out the '/raw', '/get' variables, display
all paths with the correct separator as a clickable
link that opens a file browser.

Change-Id: I81fee8e5be04c87b5b59b8fc444f75efa66fcaa0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-30 14:30:04 +02:00
hjk
62e0f4606b debugger: more precise matching for connection error messages
Change-Id: Icd1821b4ded70242d8a7e09463461d340f277f6b
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-30 14:00:14 +02:00
hjk
6d04f3ce25 preprocessor: do not loop endlessly on incomplete expressions
An missing closing parantheses after "defined(..." caused an endless loop.

Change-Id: I19b17cebc1a56880216c3bfb67c9d296f80cc064
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-05-30 13:34:38 +02:00
hjk
d982b216ff debugger: rework dumping arrays of plain data
Simple array data can be fetched in one go.
The "normal" way gdb asks the server for contents is one item
at a time, at ~3ms per round trip. Now we get 2000 in 200ms.

This also introduces a re-usable readRawMemory function and
removes a few checkAccess calls which will be triggered anyways.

Change-Id: Ic07a3d6593fd2ea45f7a8058509118fe22a845bb
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-30 11:31:29 +02:00
Christian Kandeler
94ab29519b SSH: Use plain pointers to SshConnection objects.
It used to be shared pointers so that existing connection objects could
easily be passed around in order not to open a new connection to the same
server. Since the introduction of the SshConnectionManager, this
is no longer necessary.

Change-Id: I13fd3eceaf35d562e6260e9969abbffb01edd6b5
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-29 19:07:08 +02:00
Aurindam Jana
6886dcb787 DeclarativeToolsClient: Debugger Log
Log the debugIds of selected objects.

Change-Id: Id146ccfb39639d0e8550817d61101c82cce1fa9c
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-05-29 16:54:22 +02:00
Aurindam Jana
799fc18bd7 QmlJSInspector: Remove dependency on QmlJSTools
As Location information is already cached, there is no
need to fetch the information from the QmlJS Semantic info.

Task-number: QTCREATORBUG-7409
Change-Id: I9cc3dce0910632cfe517f7697d74691e6675793b
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-05-29 16:54:12 +02:00
hjk
012281cdf8 debugger: less scary crash message
Change-Id: I2c24d3a14cf2139a363100733280c4fd0c321524
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-05-29 15:06:06 +02:00
Friedemann Kleint
7e53c4a738 CDB: Improve watch expressions.
- Fix watch expressions for array to at least point to the
  initial element.
- Return the name (which is the initial expression for the watch
  symbol group) as last resort if the evaluation fails to avoid
  obtaining "(*) 0" as expression.

Task-number: QTCREATORBUG-7408
Change-Id: Ifdf5ba59f6e18527d98b869f6a273aed283bd7da
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-29 14:33:59 +02:00
hjk
8bf3d48c84 debugger: code style, add missing space
Change-Id: I58ab4769dc26bea7234497660acf2d88c800fe46
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-29 13:06:42 +02:00
Christian Kandeler
01a5040a94 SSH: Add missing file to qbs project.
Change-Id: Ifa65a7c3382032c2c49380211ac6d4b1198668fa
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-29 13:03:33 +02:00
Aurindam Jana
07a9004f62 Debugging: Fix debugging for gdb versions < 7
Revert changes in e11a3a7697
related to -file-exec-and-symbols command.

Change-Id: I9d637fe931a6be2eaeb3d18ddcdf66e0ba4211dd
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-29 12:13:40 +02:00
Thiago Macieira
5deddc454c zeroconf: Fix a bad call to serviceResolveReply, detected by an ICC warning
The warning was:
src/libs/zeroconf/avahiLib.cpp(397): warning #68: integer conversion resulted in a change of sign
          sg->serviceResolveReply(0, kDNSServiceErr_Timeout, interface, 0, QString(), 0, 0);
                                     ^

The arguments to ServiceGatherer::serviceResolveReply seemed wrong: in
the actual function declaration, the interface is before the error
code.

Change-Id: I0fe6d2e3249294a941ad2e791bb49eaa5c3d8ab7
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-05-29 11:25:04 +02:00
Simjees Abraham
e4677d5a91 Debugger: Engines Queried on Reload of Qml.
Change-Id: I75de9fa584af8eb22a3eac6b0ab9d30b87d2ed69
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-29 11:22:07 +02:00
Simjees Abraham
bd5fe5243b Debugger: Change in response for message "destroyObject".
Response for "destroyObject" now has the debugId of the
destroyed object. This is used to fetch the parent object rather
than querying the engine context.

Change-Id: I2e5b7650cbe847117cce6952206dd479ee696f0e
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-29 11:20:48 +02:00
Fawzi Mohamed
30a6beaec0 zeroconf: adding a signal to track initial startup
* improving error messages
* track startup
Change-Id: Iba5a293b03b2d46facfbc7a9827d0d71eb7ba152
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-29 11:00:02 +02:00