Commit Graph

24608 Commits

Author SHA1 Message Date
Jędrzej Nowacki
f4ea50b527 QDumper build fix after QVector change.
Internal type QVectorData was removed, current implementation of
QVector is based on common QArrayData interface.

Change-Id: I016efa1013f0fdf809600eee4f38098d8ea3ab8f
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-05 14:45:33 +02:00
Joerg Bornemann
0f436689e8 missing include path added to mdnssd.qbs
On Windows in buildDirectory/mdnssd EventLog.h and friends get created.

Change-Id: Icc830c837d4da6ff8773b654e7b63470f87b06d4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-05 14:19:25 +02:00
Francois Ferrand
6defb83d03 TextEditor: menu for pasting from clipboard history.
Add new action to show a menu of recent clipboard history. When an item
is selected, the item is pasted.

Change-Id: Id7e1a90730404fb63762bf1f20678484ec34cd2b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-06-05 12:08:00 +02:00
Simjees Abraham
80180ba714 Debugger: Prompt for reload if set/reset binding fails.
QtCreator takes into account the result of message from
qtdeclarative for setting, resetting and updating the method
body.

Task-number: QTCREATORBUG-3264
Change-Id: I15d1a33990175e86bb3f2fee08f75dd5b7b1b628
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-06-05 12:07:06 +02:00
kh1
d3f3ab0115 Fix crash whith external help open.
Running the external window will take down the central widget as
well, cause calling m_externalWindow->setCentralWidget(m_centralWidget)
will pass ownership to the window. Calling delete on the central
widget inside the plugin constructor will crash, so set it to NULL.

Change-Id: I88ddde68a1ca3a47182de7c19847808738431149
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-06-05 11:54:31 +02:00
Simjees Abraham
73e07c9f2f Debugger:Correctly added the object to be watched.
Correction done for the bug introduced with
commit fc1f265e87.

Task-number: QTCREATORBUG-7498
Change-Id: I322a564208d70c7778a208fe0d9360ce47b75b81
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-06-05 11:30:06 +02:00
hjk
e3bd438a8f debugger: make startGdb response handling asyncronous
This allows adapters to take all responses from the startup commands
into account.

Change-Id: I295cb211a4b69cfb8c59b34030aaee8120ffe98e
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-05 11:24:12 +02:00
hjk
a7f8c3c827 debugger: reshuffle sections in module data
Keep track of elf section headers, add a dumper for
Utils::ElfSection etc.

Change-Id: I06d01c0de01ffc6b827a4a79bdc91fdb3e761d75
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-05 11:23:57 +02:00
hjk
1b1dbf1b8b debugger: make elfreader also report offset and size of sections
Change-Id: I8dd3d20ddc4652dc490d87558f46474f79300389
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-05 11:23:47 +02:00
Robert Loehning
5d01b60d56 Squish: Avoid warning about missing Harmattan target in APTW01
Change-Id: Ibeb0477a8283d229888c4744beecfc6bd8252f3c
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-06-05 11:01:00 +02:00
Orgad Shaneh
a452db5055 VCS: Fallback to raw revision if decorate fails
Change-Id: I64537306723dc1bd3c979f22af2213f0f5cd8f84
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-05 10:43:47 +02:00
Eike Ziller
ddc0c89bd6 Show warning with continue/cancel in case of many search results
Task-number: QTCREATORBUG-6116
Change-Id: I57a66b8989f1cc4137b02df370704dfe43d392ac
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-06-05 10:08:40 +02:00
David Schulz
72187be3dd Debugger: edit build-id patch for gdb-7.4.1
Change-Id: I88e8581287631ea05e044e4725cb4062620d12c9
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-05 10:07:37 +02:00
Francois Ferrand
809611f346 CppHighlighter: highlight all functions/methods.
- Highlight all function/methods (not just virtual methods).
- Highlight as a function even if number of arguments does not match. In
  that case, add a diagnostic message to indicate there are too many/too
  few arguments.
- Fix highlighting of parameters in function declarations.
  These used to be handled indiferently, and they could be mistaken for
  type or field references.
- Properly highlight template method calls.

Change-Id: I6e61c9ee47763db95c62314f9cc1c4d398df38b3
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-06-05 09:30:54 +02:00
Orgad Shaneh
16bca8b06c TextEditor: Cleanup qbs
Sort files, separate directories to groups

Change-Id: If6fca18b46802f9b506301179932a7d6025aea6b
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-05 08:49:57 +02:00
Nikolai Kosjar
90eec9f354 IDevice: Update icons indicating device state.
Simple dots in
 - red (device disconnected)
 - yellow (device connected but not ready to use) and
 - green (device connected and ready to use).

Change-Id: I04155a917e23351bb9d1125a432957ef05b64ef5
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-06-05 08:06:35 +02:00
Peter Kuemmel
b3c4aa99da CMake: Read macro definitions
The CodeBlocks generator writes for each macro definition
<Add option=-D... />
(also make getters const)

Task-number: QTCREATORBUG-3922
Change-Id: I93e10397e76ad4f34126a76c4c36e4529d48d0ad
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-04 20:31:34 +02:00
Andre Hartmann
566fa173b4 Generic Project: Add some missing QLatin1String's.
Change-Id: I0a3276dde7a3b8f90487c642d839611c80f53cf9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-04 17:35:52 +02:00
Andre Hartmann
8bf072db97 Generic Project: Add make argument "all" when re-adding a Build Step.
This makes adding a Build Step from the "Projects" configuration page
consistent to the creation of a Generic Project via the Wizard.

Change-Id: I6e947790fcd97795c29b4e0731ef8e2bff33767f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-04 17:33:16 +02:00
Christian Kandeler
90dc9ac5ec Device support: Fix yet another off-by-one error for device indices.
Prevent them from happening in the future by hiding the respective
functions in the device manager. No one should ever need to map an id to
an index directly on the device manager.

Change-Id: I41da16489b8aec67709ab3b4b115d915d4f29a4c
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-04 17:33:11 +02:00
Robert Loehning
2dcec0cac4 Squish: Updated check for new, more detailed warning
Change-Id: I55b470db573aaca679df9cb1e89511b858683214
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-06-04 16:39:42 +02:00
Christian Kandeler
5337b34e87 RemoteLinux: Respect "no_default_install" CONFIG setting.
Files with this configuration will be excluded from the list of
deployables, including the build target.

Change-Id: Id1f31ee356916669eb71e911da92d02d84891087
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-06-04 16:37:18 +02:00
Joerg Bornemann
8c5479eb71 qbs: users of QmlJSEditor must also add QmlJSTools as dependency
Change-Id: Iee5b8575c0e9979e5ff5b38fc046027c40eaba66
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-04 16:16:27 +02:00
Fawzi Mohamed
498d9c8ee4 mdnssd: More robust behaviour on windows
* use user local register key to store settings (reduces failures)
* more unique names (avoid clashes with apple version)
* more robust error handling in general
* added (disabled) registry free method to detect tcp/ip changes
* add resource for event logging

Change-Id: I4cf00d09be2731ba294f72edbaa04e1f254adef4
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-06-04 15:47:12 +02:00
Joerg Bornemann
f0c22215e5 fix mc rule in mdnssd.qbs
Change-Id: I051276a8f5d566b4ddf04cbd7a045e1311cc916b
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-04 15:44:53 +02:00
Joerg Bornemann
b711b69f03 fix defines in mdnssd.qbs
The WIN32 define was missing on Windows.

Change-Id: I22243e9384b0957b22e5df9e6d916a3bdc57e70d
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-04 15:44:41 +02:00
Fawzi Mohamed
3de4c3d770 mdnssd: drop spurious QtCore dependency
Change-Id: Ia63975ea9d310a1ef67a41e160a9cf7b3125a07a
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-06-04 15:01:31 +02:00
Robert Loehning
046f42b282 Squish: Removed unused code and data
Change-Id: I20df2aa148002ecb9b1526df125daf04bc76010e
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-06-04 14:58:33 +02:00
Robert Loehning
0853fa077b Squish: Added tst_simple_debug to suite_debugger
Change-Id: I2b13562e774780b0ccb15decdd84f32a08e1f60a
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-06-04 13:14:33 +02:00
Simjees Abraham
22e31ceb5b Qml Editor: Modified the file structure outline.
The file structure outline now displays the id and the property
values.

Task-number: QTCREATORBUG-6209
Change-Id: I33efe20aab71647bc863cff5b5434c47e8d452a4
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-06-04 13:06:32 +02:00
kh1
a031d5f686 Sort the search hits to match the actual search term.
The former unsorted list would not fully match the search term,
while searching for QString the actual top hit would be somewhere
in between other search results instead of position one. Make sure
to remove duplicates from the search hits.

Task-number: QTCREATORBUG-5167

Change-Id: I640c3e8d5a5498c5a13c083370a961f458576da5
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-06-04 12:15:46 +02:00
Orgad Shaneh
671bfb9250 VCS: Always allow "Revert Chunk"
Remove revertDiffChunkEnabled property

Any diff view might relate to previous changes, so it makes sense
to always allow reverting them

Change-Id: I8da0fb2d8625ac98140d1bde0296a4478bc6a0b7
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-04 11:35:07 +02:00
Orgad Shaneh
3c342a49dc VCS: Add 'Blame current revision' in blame context menu
Internal change: added decorateVersion() function for decorating
a revision. This is called for both the current version and previous ones

Change-Id: I8b23fd628c9db01b005c19d46580979c5a21c687
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-04 11:34:24 +02:00
Orgad Shaneh
6f7ae05d69 Git: Prompt to checkout after adding a branch
Change-Id: Ifc215303f42dcba71298f906fb6d2e576d3033d3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-04 11:29:29 +02:00
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
Robert Loehning
356d5cab23 Squish: Removed unused object
Change-Id: Ic1122d693e14084fc076c34ece5e2e8d402321ed
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-06-01 14:15:01 +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
Robert Loehning
9499fef826 Squish: Removed unused objects
Change-Id: Icded1d58ff0b59e0f29add19e44d2ede7592a16e
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-06-01 13:54:55 +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