feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,929 Commits 108 Branches 368 Tags
3b901b25a86f49ebef9be03ec762ed76422fd91c
Commit Graph

4400 Commits

Author SHA1 Message Date
David Schulz
914f978da2 Debugger: Fix dumper test when inferior runs under wow64. 
When the inferior runs under wow64, DebugBreak throws a wow64 breakpoint.
These has to be ignored because they are also thrown on every 32 bit library
load. To make sure the debugger breaks DebugBreak is replaced by a null
pointer dereference.

Change-Id: I0c0985558da1c355c1fc62a2fc5f736e54e843ce
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-07 10:22:18 +01:00
Robert Loehning
90dc3fec6d Squish: Fix tst_simple_debug after change of file template 
Change-Id: I44a8450ae089c14aac8911d6e3c5802b497d9044
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-06 15:38:14 +01:00
hjk
fafff16ce3 Debugger: Add auto test for private offsets 
Change-Id: I45e8593c492814100ddd36fa5269d6435941ad47
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-03-06 15:12:10 +01:00
Christian Stenger
521bb9156e Squish: Use Qt5.2.1 kit if possible 
Change-Id: I674c100e12c5553c2cee36ea2d78ba4e6f61a299
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-05 16:40:35 +01:00
Christian Stenger
8ef14e0ccc Squish: Add Qt5.2.1 and kit settings for Win 
Change-Id: I8805c9d7e687cf19525075b41f080857edd452d9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-05 16:40:29 +01:00
Christian Stenger
6db68e6c73 Squish: Add Qt5.2.1 and kit settings for Mac 
Change-Id: If38f9835da2839f40ef7ed3d3c9542d974a2a9dd
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-05 16:40:22 +01:00
Christian Stenger
5ac7b0d518 Squish: Add Qt5.2.1 and kit settings for Linux 
Change-Id: Ice81f6f29d769296c356e3fc8472d327b5b09a3b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-05 16:40:16 +01:00
Sergio Ahumada
c375436847 Fix some typos 
Change-Id: I3be73c2a4d256a0d28e863fd2517a4d7442b34d8
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-03-05 09:39:42 +01:00
Eike Ziller
3ba9db48ed Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I5b27eba0a9536d3e6867577ebf2b59d58a13b827
 2014-03-04 14:04:07 +01:00
Christian Stenger
0f1105d8c1 Squish: Add workaround for mixed debugging bug on Mac 
Change-Id: I4634a10d06ff30998787a215886b642d8349bb8f
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-03 13:13:34 +01:00
Christian Stenger
888d752392 Squish: Support Debugging Tools for x86 as well 
Change-Id: Ibf508de48473a48d0a88356d15a06088873a3d9c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-03 11:43:56 +01:00
Christian Kandeler
c8881e7ca2 Support configurable library location in qbs build. 
And also in the qbs sub-project (for the qbs and qmake builds). This
becomes possible with the qbs submodule update that is part of this
patch.

Change-Id: I8347a8c04a52bcb0682f32d808fb61a90ef3ba72
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-02-28 17:38:41 +01:00
Robert Loehning
23e9338e97 Squish: Enable QML debugging in doSimpleDebugging() 
Change-Id: I46a902a8038beac49e70a8a1f422c079bd2b3f44
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-02-28 15:34:48 +01:00
Eike Ziller
92e930b367 Merge remote-tracking branch 'origin/3.1' 2014-02-28 13:53:42 +01:00
Robert Loehning
c8027974ca Squish: Update expected project tree 
Including revert of d67b7229da

Change-Id: I5712739385b4e08b494f6915cd4fc43928653e04
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-02-28 11:39:11 +01:00
Orgad Shaneh
c6ca15dc15 C++: Record macro uses in #if defined(MACRO) 
Change-Id: I4d99053f540073483c16ce842426bf8cd3def421
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2014-02-27 21:08:34 +01:00
Eike Ziller
f5fdc07d47 Merge remote-tracking branch 'origin/3.1' 2014-02-27 17:13:27 +01:00
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