feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
54,723 Commits 108 Branches 368 Tags
41df91ece8e2d88fabbaf00b2074b810ba93b51a
Commit Graph

4883 Commits

Author SHA1 Message Date
Orgad Shaneh
5d2cd2e56d C++: Fix handling of #undef 
* If the macro is defined before, track its reference
* Synchronize environment line before calling remove, which
  currently sets incorrect line
* Set macro offset

Task-number: QTCREATORBUG-10454
Change-Id: I480d16423a976a025bb8c71046610a46f9d7b0fd
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2014-02-27 16:13:51 +01:00
Erik Verbruggen
36dccb42fa C++: fix indentation for static var decls of anonymous classes. 
Task-number: QTCREATORBUG-11392

Change-Id: Ie5dd9014383b639e63653e8abc856fea9e620e49
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2014-02-27 15:57:40 +01:00
Orgad Shaneh
24a5c3e913 Tests: Record macro definition check 
Change-Id: Ia2151ead6ba4ad2e2a3598d05dfc24a10e6a7cdb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2014-02-27 15:17:29 +01:00
hjk
3746499472 Debugger: Make more tests pass in the presence of optimizations 
Variables that we want to check should not be optimized out.

Change-Id: I8af633094674ff78b43b27756a662221b2c56e99
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-27 13:08:38 +01:00
Christian Stenger
139a1a8dbe Squish: Fix tst_rename_file 
Change-Id: Ic8c7aac5133b3df32b25188c1ab325a985cc3d42
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-27 12:27:55 +01:00
Christian Stenger
b8a1807542 Squish: Fix tst_session_handling 
Change-Id: I85348bffe6c24be4663f67fc62e95a3e663b828c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-27 12:20:27 +01:00
hjk
21ce31a4ef Debugger: Make simple manual test work with android 
Change-Id: I33283154214a07a0232b8d52c3da62861956a9a1
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-26 16:29:58 +01:00
hjk
f0d3cce9fd Debugger: Fix warnings in manual test code 
Change-Id: I1ee1cc2eb6f93c2e58e1c67d55cf3dfe82fa9f25
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-25 17:56:13 +01:00
Orgad Shaneh
67caa75c56 C++: Fix preprocessing of uncontinued line-escaping 
The following snippet demonstrates the problem:

--- snip ---
// comment \

#include <something.h>
...

class Foo
{
    ...
};
--- snap ---

If there are >=9 empty/preprocessor lines, the preprocessed source
becomes
// comment \
# 12 "file.cpp"
...

The lexer considers the line marker as a continued C++ comment, and
highlighting is broken

Change-Id: I30a2fc7d19b279316e9273697179c90d81099573
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-02-24 21:56:52 +01:00
Orgad Shaneh
dabdb60299 C++: Preserve comments after preprocessor directives 
Task-number: QTCREATORBUG-11216
Change-Id: Iac10e75f0f5c504b79e8466607dc1f478e578f99
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-02-24 21:56:40 +01:00
Orgad Shaneh
6133920bfe Preprocessor: Adjust lines also for multiline C++ comments 
Change-Id: I87d6e76be3030e617603209c3a1b8b3c476cf1f6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2014-02-24 21:56:23 +01:00
Nikolai Kosjar
c2803b00be CppTools: Avoid self-include 
...in CPlusPlus::Document due to cyclic includes.

Task-number: QTCREATORBUG-11457
Change-Id: I1ca19c901c26d9984d795a61879dd6b41c57096c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-02-24 14:08:11 +01:00
Christian Stenger
ae781b1919 Squish: Update Qt Quick tests to reflect new available versions 
Change-Id: I60d4b2ca64825101358774a4e04cceb3040fc630
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-19 14:38:55 +01:00
hjk
2a4cb11d1b Debugger: Fix disassembler parsing if print max-symbolic-offset is 1 
Task-number: QTCREATORBUG-11504
Change-Id: Iaf26fbeefda46280e20b6a0943d15c4f2423f674
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-19 09:55:11 +01:00
hjk
c68ebeed2e QtcProcess: Introduce a QtcProcess::Arguments class 
This is used to get a platform-agnostic handle on "command line
arguments". It essentially wraps a single QString on Windows,
and a QStringList everywhere else.

As a consequence, several occurrences of #ifdef Q_OS_*
can be removed from the codebase.

Change-Id: Ic93118c1bd0bce0ebb58f416d395dbaebb861772
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2014-02-19 09:19:28 +01:00
Christian Stenger
a85f64a7c6 Squish: Fix DiffEditor related object types 
Change-Id: I295dc127a11e10496d441438feb7d1b8e15994b6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-18 18:46:38 +01:00
Christian Stenger
e7297926ef Squish: Update objects after merging BaseValidatingEdit... 
...into FancyLineEdit.

Change-Id: I7e45861783a7bdf160827595b4e455d869884c81
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-18 18:46:18 +01:00
Christian Stenger
48770e5785 Squish: Remove gdb debugging helper stuff 
Change-Id: Ib437d65da31546c8705b64d5ab320f7a7e226bc7
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-17 14:50:12 +01:00
Christian Stenger
e574e1eae0 Squish: Fix tst_default_settings 
Script error was introduced in d26f01fdbc.

Change-Id: Ifafcf41822fe0f3ad5ab5a3b507d54c7c314bdc3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-17 14:14:11 +01:00
Christian Stenger
8d759829cd Squish: Update object types after merging FilterLineEdit... 
...into FancyLineEdit.

Change-Id: Id9b6c459cf994baa00b51f3125a8ba8718421a46
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-14 17:00:15 +01:00
Robert Loehning
1120edcb79 Squish: Fix suite_QMLS 
Change-Id: Iab607408858bcf0acf7f55fd4a6145ee87090d4a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-02-14 11:37:24 +01:00
Christian Stenger
4ae5445d8f Squish: Get the right QLabel on Qt Versions option page 
Change-Id: Idcec56352536b8b508d7fc7d5205bc54b5b14f34
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-14 08:35:15 +01:00
Christian Stenger
12b0fedcfc Squish: Do not crash on fail in getEditorForFileSuffix() 
Change-Id: I3d3519e2bb203e52afd2785aac46997616b4ca4b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-13 16:21:14 +01:00
Robert Loehning
6a8dc025d5 Squish: Update objects moved from Find::Internal 
Change-Id: Icc34cdcf6b6fc5aa08f10b1cad4306ce666d21dc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-02-13 13:37:22 +01:00
Robert Loehning
d67b7229da Squish: Update expected project tree 
Change-Id: I01b6d8206a753e43970bc5a32010ddaefe862537
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-02-13 13:25:24 +01:00
Christian Stenger
d26f01fdbc Squish: Skip non-executable debuggers 
Change-Id: Ibdcd4c01e2393ad34115764e1babf810a7f09053
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-13 13:06:15 +01:00
Christian Stenger
f3f1edfa06 Squish: Fix Qt Quick / QML related tests 
Adjust expected files to slightly changed layout.

Change-Id: I4b5ab838558b2e1b3a0c13fafcc37efebb014c19
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-12 17:23:56 +01:00
Robert Loehning
29acdd89b3 Squish: Update Qt Creator_QmlJSEditor::QmlJSTextEditorWidget 
Change-Id: I3fd264e15706f1e763543eeb553f7b16071fdfa7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-02-12 15:12:23 +01:00
Christian Stenger
3f44590f4b Squish: Remove special handling for gdb issues on Mac 
Change-Id: Ib3473b9f5e984441b7d1dcfe4f5c007e5b435f5a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-12 09:04:21 +01:00
Christian Stenger
6b443e877c Squish: Use lldb for Qt4 desktop kits on Mac 
Change-Id: I47874e3ea2b0b2811c66cc0b8866760fdd09755a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-12 09:04:11 +01:00
Christian Stenger
d602a942a9 Squish: Fix tst_simple_analyze on Windows 
Change-Id: I7088e237de1f1c602aa79abe19d0a656693cfa20
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-11 12:46:41 +01:00
Christian Stenger
aed01c76d7 Squish: Support different lldb versions on Linux 
Change-Id: I7af39d335c7025dc29ac6cc718089977450a541c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-11 12:46:27 +01:00
Eike Ziller
b03a981a41 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/shared/qbs

Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
 2014-02-11 09:14:22 +01:00
Orgad Shaneh
4089012735 GenericHighligher: Preserve whole context on LineContinue 
Task-number: QTCREATORBUG-11063
Change-Id: I5f23a2a1f1db370e732c1a101a6581fa5c493085
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-02-05 13:46:44 +01:00
Christian Stenger
650d8710cb Squish: Do not rely on default installation path 
Change-Id: Iac5d45b3cbdb5ecb18d971b37189b27164abbaf3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-05 08:55:05 +01:00
hjk
f94249350d Debugger: Make simple manual test use C++11 also with Qt 4 
Change-Id: I6c5d891cc3b3ed1afdf12e2dc08d35e10f190c01
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
 2014-02-04 19:27:58 +01:00
Orgad Shaneh
7febebc294 C++: Fix indentation in preprocessor tests 
Easier to compare when indentation is aligned

Change-Id: I216073dc167c0ed785616ae308b566db7f910592
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-02-04 11:34:03 +01:00
Orgad Shaneh
e600424648 C++: Fix support for incremental input with \n 
Also fix false positive line continuation on blank line

e.g.
"foo \

bar"

Change-Id: Ic6d345a4b578c955411d119b8438c8dc5065c072
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-02-04 11:33:54 +01:00
Orgad Shaneh
524c37112f GenericHighlighter: Make tests independent 
Change-Id: I30c3551badb503013e62a0635f04d7aae6168f4e
Reviewed-by: Leandro Melo <ltcmelo@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-02-04 11:30:19 +01:00
Christian Stenger
22f9d58b0d Tests: Fix compile 
Compile error was introduced by 0eea7ca90b.

Change-Id: Ie3f7a95a84d7774e85845abd6288b254ebd24c5a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2014-02-03 10:59:24 +01:00
hjk
871a4bcad3 Debugger: Re-structure version check in QDir dumper 
Change-Id: Ic14155688e0e9bbe0d45cde20563929b7370695d
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-03 07:56:57 +01:00
hjk
38d4cc2807 Debugger: Test cosmetics 
Use more compact syntax for test restrictions.
Merge some more cases.

Change-Id: I813cc1aa0d06aaac2e1e105f67b6751ebf3d98d8
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-31 10:11:42 +01:00
Christian Stenger
207d3f9a3a Squish: Fix running hooked subprocess on Mac 
Change-Id: Ib7879aab6227758373023d0164edfc6f10f0e23c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-31 09:02:47 +01:00
hjk
3798552beb Debugger: Make QVariant(QHostAddress) test pass with LLDB 
Enums are printed differently. Accept the fact.

Change-Id: I8e1599517c7e711ea8b04d85f8298b0d73f1cbab
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-30 18:48:28 +01:00
hjk
7df04793d7 Debugger: Make QRegion and QThread dumper test pass on Mac 
Both need DYLD_IMAGE_SUFFIX=_debug.

Change-Id: I5f5bb9ce630099a0e06bf261c4c7cc60ba876b9c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-30 18:39:52 +01:00
hjk
e625ea248e Debugger: Combine some of the QString related auto tests 
Change-Id: I05fbb7ce630099a0e06bf261c4c7cc60ba876b9c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-30 16:31:33 +01:00
hjk
c6f4931624 Debugger: Search static meta objects recursively also with LLDB 
Change-Id: I5e7eb59e971933fef8ef94c20333035188d33a57
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-30 16:04:29 +01:00
hjk
e6e808669f Debugger: Require DYLD_IMAGE_SUFFIX for QObject name tests 
Would be nice to be able to avoid that...

Change-Id: Ib73de2d21266c2dd77dfda06c8b8b579a25f37ca
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-30 15:57:14 +01:00
hjk
909d26b860 Debugger: Disable the LongEvaluation auto test 
Change-Id: Iad6190d3c741ae50788b803f165df130549a41fc
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-30 14:03:18 +01:00
hjk
d7c95c9ec3 Debugger: Disable C _Complex auto test for GDB < 7.6 
Doesn't work on command line either.

Change-Id: If4da895393d9310aad25df89f938ea0138253760
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-30 13:25:37 +01:00