Commit Graph

20593 Commits

Author SHA1 Message Date
Leandro Melo
23c637c4f6 C++: Introduce unicode char/strings support
Those are the types char16_t and char32_t along with the new
char/string literals u'', U'', u"", u8"", and U"".

This is particularly important for the use of QStringLiteral
since in some platforms it relies on expansion such as above.

Note: The string literals quickfixes still need some tunning.

Task-number: QTCREATORBUG-7449
Change-Id: Iebcfea15677dc8e0ebb6143def89a5477e1be7d4
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-06 14:55:07 +02:00
Leandro Melo
b88a5f5d38 C++: Add Token::isStringLiteral and Token::isCharLiteral
It will be particularly handy when introducing the new C++11
string/char literals: U"abc", u"abc", u8"abc", U'a', u'a'.

Change-Id: Ic250f5a7b999da322debb24fc0171aaef333f356
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-06 14:54:54 +02:00
Aurindam Jana
88dcefe0e1 QmlDebugger: Edit breakpoints
Remove and add breakpoint when a breakpoint is edited.

Change-Id: Idb231c0e9d44fe295007b299660fcbe3a980a252
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-06-06 14:15:46 +02:00
Andre Hartmann
44a3a5e070 Implemented Rename Macro Usages
Works the same way as Rename Usages for C++ Symbols.

For now, no Search Again as this requieres further work.

Task-number: QTCREATORBUG-413

Change-Id: I09e85ea1e8c247f5ce0b6bc566aba8018c1569e4
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-06-06 14:10:07 +02:00
Orgad Shaneh
6147419f87 ctrlc_stub: Send Ctrl-Break instead of Ctrl-C
This forces also processes initiated using 'start' to terminate

Task-number: QTCREATORBUG-7455
Change-Id: I2ac7b31ebe67510dd17a2991efc30212987e967d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-06 14:07:43 +02:00
Fawzi Mohamed
7307d2eafb mdnssd: remove valgrind warning
Change-Id: I143bd3923e37af4ecbda5ad6d40a6b29f2118e6a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
2012-06-06 12:58:39 +02:00
Simjees Abraham
32f25fcfc1 Apply on Save: Infobar displayed cleared when debugging ends
Infobar displayed cleared if the user decides to end debugging
without reloading Qml.

Change-Id: Ic502c9b75a4f4e41aa3e843706f9e1fc0113f0e7
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-06-06 12:16:15 +02:00
Daniel Teske
79d35cd886 Qt4ProjectManager: Fix codemodel not finding source files in VPATH
Due to not using VPATH for resolving the absolute paths.
Task-number: QTCREATORBUG-7441

Change-Id: Ifd76e6e782195b6371aac49ed257534184149805
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-06 12:09:19 +02:00
Andre Hartmann
72db9dcff3 Qt4ProjectManager: Add some missing QLatin1String's.
Change-Id: Ib5de5cb3b7c9b716745a1414a27f0cec23c2d776
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-06 12:08:54 +02:00
Andre Hartmann
68157e50f3 Qt4ProjectManager: Whitespace fixes.
Change-Id: Ia1d31e4f93c4af70a1b8628572ef07fa7ee03f73
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-06 11:28:26 +02:00
Christian Kandeler
a437ede424 SSH: Fix some potential crashes.
Change-Id: I102e35c3dcd3725f357c91d9f0a77ab28d881b0d
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
2012-06-06 11:12:26 +02:00
hjk
2d466528c9 debugger: rework core adapter
The name of the binary is now read using the elfreader instead
of attaching gdb twice.

Change-Id: I7a75bc64278c4f43e7085d2e479b53173602c966
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-06 09:41:08 +02:00
Christian Kandeler
291e23d0e1 RemoteLinux: Make disk space check step extensible.
Also fix cloning.

Change-Id: I32db1fd2a98486e2871c01d4c0f9aebd2f262924
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
2012-06-06 09:26:11 +02:00
Daniel Teske
7339ab60e6 Qt4PriFileNode: Add const to baseVPaths and fullVPaths
Change-Id: Ia36969f0802c96c657079d6f71d49fb484a600ad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-05 20:02:41 +02:00
hjk
cc6c3eab1a debugger: add Load Remote Core
Change-Id: I3ea5ddd608ff9e6764a995dc042466d436ca8474
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-05 17:40:48 +02:00
Simjees Abraham
d40f41cd77 Debugger: Fetch object done only if parent Iname is known.
When an object is created, the properties are fetched and added
to the object tree only if the parent Iname is known.

Change-Id: Id49a1873e9ffaf33689fe11297341cf56472c1be
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-06-05 16:44:13 +02:00
hjk
c12a7a224f remotelinux: use base classes when appropriate
Change-Id: I9951c7470239e524f1bebb77f22b8ee59eab5183
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-06-05 15:52:02 +02:00
hjk
d5420d3dc2 idevice: move ssh connection parameters to base class
This is arguably not linux specific and allows easier access to
the connection data e.g. from the debugger plugin.

Change-Id: I4bb7f8f59590e038cf1468e54095de7983bc6b9e
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-06-05 15:38:14 +02:00
Eike Ziller
cdd44befff Add ActionContainer::addSeparator(...)
Gets rid of a lot of code duplication.

Change-Id: I2ce38fb38a0b61cb821e0bdc7bcc9a7ccdf9da72
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-05 15:19:30 +02:00
Leandro Melo
d90264d6c2 C++: Also expand first token after macro define
It was previously beeing skipped.

Change-Id: Iadd9b03acbcf0ee0fb4db537b8597661cb93af3f
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-05 15:05:19 +02:00
Leandro Melo
809a4ed91a C++: Also parse static_assert as top-level declaration
Add some checks for C++11 flag as well.

Change-Id: Ic5ee81d72bc88a22e71b324ef01014791b833604
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-05 15:03:01 +02:00
hjk
4a8bdec7ea remotelinux: code style
Change-Id: I541dbcb7947fb8c24180f514f489be5251017e7f
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-06-05 14:59:30 +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
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
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
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
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