Commit Graph

20593 Commits

Author SHA1 Message Date
Tobias Hunger
47a79e2225 Fix possible crash when checking sysroot
Change-Id: I556ef0db09ceedd32e005b7057c56629d6fda5ec
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-06-28 22:01:26 +02:00
Tobias Hunger
8d81f98cab Fix possible crash in targetsetuppage
Change-Id: Icff504ca751e5ad6619b6c0caf72942227dbc7e0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-06-28 22:01:17 +02:00
Daniel Teske
9fa3ba5c44 Show a message box if opening a project fails via File/Open
Task-number: QTCREATORBUG-7447

Change-Id: I421d93ccd9e12de854bd5a0ab35158b450863fec
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-28 18:00:50 +02:00
Nicolas Arnaud-Cormos
62a22e0aa3 Don't cache mapping between source and private header
When switching from a header to a source file, the source->header
mapping is cached. It's not the case anymore for private headers (_p).

Change-Id: I481c0613e29db0a3fb4e17f339626abb49ffa8e2
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-06-28 17:14:50 +02:00
Friedemann Kleint
96f5bc837f Fix compilation with Qt 5.
Change-Id: I4ace07cb2255ed8231659253f72a16cf626a077a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-06-28 16:43:44 +02:00
Friedemann Kleint
7c7e6bd6c4 Debugger: Fix compilation.
Breakage introduced by ded2dd12b8.

Change-Id: I2293024c42c0b237960ad0a1dee06a01dd777ba8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-06-28 16:32:29 +02:00
Francois Ferrand
42a885fc54 Allow expanding items in the overview combobox.
This makes navigation through large files much easier.

Change-Id: Ie55f75078a1727949db6e8824af4795deb96292e
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-06-28 16:32:03 +02:00
hjk
c4da217c3e bineditor: some s/QString/Core::Id/
Change-Id: I97b4222d4482d59fa875b016eb3bf248969bbadc
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-28 16:14:06 +02:00
Francois Ferrand
0b12ed143e [CodeAssist] Logical sort of proposals.
Improve the sorting of proposals, so that "logical" sort is used: if there are
numeric parts in the strings, these are compared as numbers instead of purely
lexicographically.

Thus, the list: [item1, item10, item1b, item2]
gets sorted as: [item1, item1b, item2, item10]

Change-Id: I16a0106d9dc9bb27731f96c3f180ad20cd9a44f5
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-06-28 16:09:20 +02:00
hjk
ded2dd12b8 debugger: adjust to profile changes
This replaces the debugger command, sysroot and target abi fields
with a profile id.

Change-Id: I831c42ff8624fcfa520c2f28f6f06d73191b2680
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-28 15:30:15 +02:00
Daniel Teske
9393d18fdb Fix memory leak, delete EditorConfigurationPrivate
Change-Id: I23869f5669bf06b599454702b45d2b3140252935
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-06-28 15:10:35 +02:00
Leandro Melo
04094c274e C++: Enable C++11 keywords in macro uses
Just in case compilers id defining such things.

Change-Id: Ica6af8462e90bfab2bfa883ec12d5e648d6d33db
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-28 13:50:36 +02:00
Leandro Melo
4557d586f6 C++: Initialize member
Change-Id: Ifb708cb875aa1403de66a4c3302f70e0d1b4d2ac
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-28 13:50:28 +02:00
Daniel Teske
cb6094af36 Fix memory leak
Change-Id: Ifda897b1dc61a964ef6f4f0fb57b82b08d7a28f3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-28 13:06:40 +02:00
Daniel Teske
71f903662b Fix memory leak in Codepaster plugin
Change-Id: Id40b94c088a398daa599d91a9310c6a4accd4ed0
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-28 13:06:12 +02:00
Daniel Teske
7e7f5aced6 Fix memory leak
Change-Id: Ie6faa0ba729e5359c64ea684c85fab1e188e2136
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-28 12:26:34 +02:00
Christian Kandeler
3c404484de RemoteLinux: Fix run config clone method.
Not used anywhere currently, but should still be correct, of course.

Change-Id: I163bd94b87af8b0e71caa2cfdafd1551a4de86a4
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-28 11:55:47 +02:00
Christian Kandeler
c1a89d2c61 SSH: Close channels before re-using a connection.
Otherwise a new client acquiring the connection could be affected by
things happening in channels that were not opened by that client, which
would certainly be unexpected.
In particular, if the new owner of the connection runs in a different
thread than the old one, crashes could occur since the connection
assumes its channels run in the same thread.

Change-Id: I4fdf2b5a3751ed506631d6878e94342da033c31c
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-28 11:55:37 +02:00
Leandro Melo
621e5c3dbe C++: Parse emit/Q_EMIT properly
The parser now understands emit/Q_EMIT as an expression statement.

Also, the recent fixes in the preprocessor introduced a side-effect
in the hanlding of code such as: emit signal(); Member signal started
being treated as a local use (parsed as a declaration) and possibily
being highlighted as unused variable.

Previously that worked by accident since there was an inconsistency
in the preprocessor on which only object-like macros were being
expanded even when the "no expand" flag was set. Then, the code
mentioned above was being parsed as an expression, what kind of worked.

Change-Id: I47a68ed4c1c1702872620b8ed7c7264fb0997034
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-06-28 11:49:50 +02:00
Tobias Hunger
d1971174d4 Remove unused member variable from debugger plugin
Change-Id: If630ba9b3d108c2b81316555e67d4bc6a6beb098
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-28 08:32:01 +02:00
hjk
68ce7a667b debugger: speed up logging by collecting bigger chunks
Change-Id: Ie2171e0afdc0e3296f57974b1e4e5ee952658626
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-28 08:16:59 +02:00
hjk
27fbe170d4 remotelinux: remove line noise
Change-Id: I5878f69257dd396e52c2835413d7045ed5c71f02
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-28 08:16:27 +02:00
hjk
ec06d3f1af debugger: make shrinking of log buffer faster
Change-Id: I09ff0bf0c5fcc7df5c5dc9a05752754faee9320a
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-27 22:05:15 +02:00
Robert Loehning
f004876500 Fixed string in targetsetuppage
Change-Id: If69721980c2fe42f27e08d7448e67e35a53784f8
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-27 17:40:26 +02:00
Orgad Shaneh
882a51b75c Fix Botan build with msvc
Change-Id: I516e9e4a3a267bcaf17038cd79298358d93d0ec0
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-06-27 15:42:36 +02:00
Orgad Shaneh
6db2145b23 S60: Fix warning
Change-Id: Ia4e356a38e63f426b40b384a066744aa7746f86e
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-06-27 15:32:28 +02:00
hjk
579e95af8f debugger: more Profile adjustments
Change-Id: Icb7f62da5a23e3208e1b75524118f1b75bd7a4c8
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-27 15:00:12 +02:00
hjk
4816cb3299 debugger: make <F10> work to 'break on main' for remote linux
Change-Id: I6893ab74d8c35a92a9493fc5601ef52f4c66bf01
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-06-27 14:59:58 +02:00
Tobias Hunger
ead0a7e706 Fix import of device settings
This stops certain profiles from being recreated during import
of a project.

Task-number: QTCREATORBUG-7564
Change-Id: I2194ec704484bfd9c5a52608e2b03272d544ab82
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-27 12:44:22 +02:00
Tobias Hunger
0af5148425 Profile: Use strings which simplifies the code a bit
Change-Id: Ibb34cfc837850803befe8ba4cd1696e2988bc738
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-27 12:44:14 +02:00
Tobias Hunger
a285e26d76 Fix broken import of debugger on upgading to profiles
Change-Id: Ie11b8f1efaf4d6b5c6b0f2838bcf7ac36ac434ba
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-27 12:44:06 +02:00
Tobias Hunger
313419b58b Fix debugger path
Always use the full path to avoid spurious warnings about the debugger
being missing.

Change-Id: I8ffe768f71fa89327f711752d6339ab969a8d34e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-27 12:43:55 +02:00
Tobias Hunger
bf4b6d6fc3 Profile: Use tool chain to make profile name unique
Task-number: QTCREATORBUG-7560

Change-Id: I194ab0084f57c266e1a712ec31873a826a61ae4a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2012-06-27 12:43:48 +02:00
Tobias Hunger
782dbf1c1c ProfileManager: Create the desktop profile as manual
This allows our users to change/remove it.

Task-number: QTCREATORBUG-7568
Change-Id: Ie004eb73ceb4a4c77882db037609af4a3f226081
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-27 12:42:03 +02:00
Christian Kandeler
68237b9fdf Botan: Fix compilation with 64-bit MSVC.
Change-Id: I9d5e7c1e39c9536a33f6eb0d8f3e1002a2ed0a96
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-06-27 12:22:03 +02:00
Christian Kandeler
fcc9ba4b99 Update botan library.
Old version was 1.8.8, new one is 1.10.2.
We now put all the code into one pair of files (via
a botan configure option) and move platform-specific
defines into the pro/qbs files. Besides drastically
reducing the number of files, this is expected to make
future updates less messy.

Change-Id: I004166b2ab15b6a699d69aebfcfd9999c5ccdb91
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-26 16:58:22 +02:00
Christian Kandeler
c6ac435daf Fix qbs build.
Change-Id: I6710a934531286181decd628b6826c03c33aa6e7
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-26 16:45:17 +02:00
Tobias Hunger
8fc05ebf61 SysRoot: Do not treat "" as invalid sysroot
Do not treat "" as a invalid sysroot after the sysroot was already
set to something else.

Change-Id: I241d874969a7b7d81dfee0f2804579e5a92ada25
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-26 15:39:25 +02:00
hjk
6a6c5e5af5 debugger: port 'Attach to Core' over to new Profile architecture
Change-Id: I89e743314025fe715982b4c43849ce128e014f55
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-26 15:36:27 +02:00
hjk
b7d926c389 debugger: reduce line noise
Change-Id: Id4a99596c8e35b1d422ce21798f70796a16c3c57
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-26 15:36:05 +02:00
Tobias Hunger
77417e69da ProfileModel: Do not add "(default)" to name of profile
Do not add "(default)" used to mark the default profile to
the profiles name when changing some of its settings.

Task-number: QTCREATORBUG-7573
Change-Id: I41497013e5321f9169d054f549966fb29329786f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-26 12:53:49 +02:00
Tobias Hunger
489f1a839c Allow duplicate profiles
Allow duplicate targets (or profiles) to exist.

Task-number: QTCREATORBUG-7574
Change-Id: Id0d658f8f2954477e3b7834f6142295aaff5feaa
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-26 10:35:20 +02:00
Orgad Shaneh
ad7874ed87 Git: If stashed before pull, stash pop after it
Change-Id: Ie983df1ffadac27551bbc51199784c0bc8610c14
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-26 10:30:47 +02:00
Orgad Shaneh
616cb86ea7 Git: Better status resolving
Do not consider new files as Changed

Change-Id: Id1ddb870e51a974a2d20fc2ecc9fb499d1db6f8c
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-26 10:29:20 +02:00
Tyler Mandry
17eedb2af9 Android: Remember 'Use local qt libs' deploy setting
Change-Id: Id673f2a28d720c803342948adc4e89678d1a6390
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-26 10:28:26 +02:00
Daniel Teske
15088e76ed Fix indentation
Change-Id: I71354f64733a71240cea0a625dbd8f0b9b5e918b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-25 19:02:25 +02:00
Konstantin Tokarev
7d089b35a3 Show shortcuts in tooltips of ImageViewer
Change-Id: I90fa2e3bddc99cff721c30499046a11a3dd93486
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-25 18:50:22 +02:00
Konstantin Tokarev
108f7d804f ImageViewer: Register action "ToggleAnimation"
Change-Id: I91771d0cd44c3c174bfedb7a5b8adfd840aa86ef
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-25 18:50:02 +02:00
Leandro Melo
d6ccffc06c C++: Core changes in preprocessing
Summary of most relevant items:

- Preprocessor output format change. No more gen true/false. Instead
  a more intuitive and natural expansion (like from a real compiler) is
  performed directly corresponding to the macro invocation. Notice that
  information about the generated tokens is not lost, because it's now
  embedded in the expansion section header (in terms of lines and columns
  as explained in the code). In addition the location on where the macro
  expansion happens is also documented for future use.

- Fix line control directives and associated token line numbers.
  This was not detected in tests cases because some of them were
  actually wrong: Within expansions the line information was being
  considered as originally computed in the macro definition, while
  the desired and expected for Creator's reporting mechanism (just
  like regular compilers) is the line from the expanded version
  of the tokens.

- Do not allow for eager expansion. This was previously being done
  inside define directives. However, it's not allowed and might
  lead to incorrect results, since the argument substitution should
  only happen upon the macro invocation (and following nested ones).
  At least GCC and clang are consistent with that. See test case
  tst_Preprocessor:dont_eagerly_expand for a detailed explanation.

- Revive the 'expanded' token flag. This is used to mark every token
  that originates from a macro expansion. Notice, however, that
  expanded tokens are not necessarily generated tokens (although
  every generated token is a expanded token). Expanded tokens that
  are not generated are those which are still considered by our
  code model features, since they are visible on the editor. The
  translation unit is smart enough to calculate line/column position
  for such tokens based on the information from the expansion section
  header.

- How expansions are tracked has also changed. Now, we simply add
  two surrounding marker tokens to each "top-level" expansion
  sequence. There is an enumeration that control expansion states.
  Also, no "previous" token is kept around.

- Preprocessor client methods suffered a change in signature so
  they now receive the line number of the action in question as
  a paramater. Previously such line could be retrieved by the client
  implementation by accessing the environment line. However, this
  is not reliable because we try to avoid synchronization of the
  output/environment lines in order to avoid unnecessary output,
  while expanding macros or handling preprocessor directives.

- Although macros are not expanded during define directives (as
  mentioned above) the preprocessor client is now "notified"
  when it sees a macro. This is to allow usage tracking.

- Other small stuff.

This is all in one patch because the fixes are a consequence
of the change in preprocessing control.

Change-Id: I8f4c6e6366f37756ec65d0a93b79f72a3ac4ed50
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-06-25 15:49:27 +02:00
Orgad Shaneh
7204863c13 Fix qbs build
Change-Id: Ib484836705c30cb90ee52e87867e2bfde6358d64
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-25 12:10:17 +02:00