feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
34,458 Commits 108 Branches 368 Tags
e110a88cee2fb40e36a3b2b51c083baf67ae9233
Commit Graph

1254 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
hjk
89f5964695 Debugger: Build auto tests with -gdwarf-3 when targeting GDB 7.4 
We don't see any local variables otherwise.

Change-Id: Ieb9972e8e4b79b1d3a328c52c56244371664ebee
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-30 12:40:18 +01:00
hjk
a9834fe11a Debugger: Finetuning of QVariant dumper 
LLDB doesn't like to lookup types in some cases.
Make it work.

Change-Id: I2c95ab4ab7f765ad42bf6bd35c6f790de5fe366e
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-29 17:31:32 +01:00
hjk
8cf01f81c1 Debugger: Object name display needs debug image on Mac 
This should be avoided if possible...

Change-Id: I4c95ab4ab7f765ad42bf6bd35c6f790de5f03668
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-29 16:49:04 +01:00
hjk
66a1878558 Debugger: Bundle some more autotests to speed up test runs 
Change-Id: Ifc45ab4ab7f765ad42bf6bd35c6f790de5f03668
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-29 14:16:08 +01:00
hjk
d37e890a1d Debugger: Show name also for QObject subclasses without Q_OBJECT macro 
Change-Id: Ifabf3cc68751a06c15fc1a5a05cad5e5a64c8775
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-29 13:56:01 +01:00
Fawzi Mohamed
a8ea0a0736 qmljs: generalize language treatement 
* better support qbs and similar non QtQuick qml languages
* begin to clean and migrate things from ModelManager to
  ModelManagerInterface

Change-Id: Ifa39dc1e4c568e9e21307f4913dcb5989e80420f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-01-28 15:01:00 +01:00
hjk
b852ee862d Debugger: Merge QHash dumper tests 
Less cycles.

Change-Id: Id48e0c4b1c6b71dc0c743f8815db2d6b1daa95f6
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-28 14:09:34 +01:00
hjk
f3fbc36d77 Debugger: Handle Qt4/5 behavior incompatibility in QVariant handler 
Change-Id: I059955b24daa323d4f0a85e67650ee29c018d1b6
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-27 14:16:47 +01:00
hjk
392123388a Debugger: Some qobject dumper speedup 
Slight change in behavior: Only classes with Q_OBJECT
macro are now recognized as QObjects.

Change-Id: If2df6c31ef6d098944e317e27dfcbc21d60f61ee
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-24 18:27:00 +01:00
hjk
cc3facd944 Debugger: Enable QObject property display with LLDB 
Finally.

Change-Id: I3257ffbb23ca2ea4eec9a97335a95580c9c4482b
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-24 17:36:27 +01:00
hjk
063075ecad Debugger: Merge more test cases 
Change-Id: I478b4bfb5fa615b2ea982ca6635c5e8e3478070c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-23 10:32:21 +01:00
hjk
d8e132d15d Debugger: Disable item model dumper for LLDB 
Needs better infrastructure.

Change-Id: I53a53953bd347c296626c03636775f6057faf385
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-22 16:37:35 +01:00
hjk
5199c905c7 Debugger: Merge a few more dumpers 
Change-Id: I8a39598f561a011fe5ec9d8dd589ded5a33ba6ac
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-22 14:32:56 +01:00
hjk
1e858e1116 Debugger: Merge a few tests 
Dumper test compile time is a significant part of test run time,
we can save a few cycles by lumping similar tests together.

Change-Id: I716ec336836c1511e5c13f58e72b59a46a2250a8
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-21 19:24:16 +01:00
hjk
20ea8a7d67 Debugger: Fix buglets in QVariant dumpers 
Change-Id: I3ac3906600369b51f6fc9f6430f95f21e0ac3e3b
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-21 18:20:13 +01:00
Orgad Shaneh
0f4e3c356a C++: Support multiline strings and comments 
Task-number: QTCREATORBUG-662
Change-Id: I0997fe2afaba71998d5da549b7141df0c023ff12
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-01-21 10:54:56 +01:00
hjk
376f58df34 Debugger: Fix QObject/property dumper 
Change-Id: Ied68fd07e077a185223a68cc504fff5a5b9391ac
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-20 17:08:53 +01:00
Orgad Shaneh
06592b28ad C++: Consolidate with/without comments preprocessor tests 
Change-Id: Ib08569d642da51f6d51bb0763fc95d5a5c13d28c
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-01-20 16:27:49 +01:00
Orgad Shaneh
0a817c4ef5 C++: Cleanup preprocessor tests 
Change-Id: Ia1b7dee24a3d7e20440dca5040cf9ffdaaf066e2
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-01-20 16:27:34 +01:00
Orgad Shaneh
e51fbd2009 C++: Fix debugging of lexer test 
spell() crashes if identifier is not properly created

Change-Id: I1c3949c3fed2282d893914fa2922f6c281d1f8cd
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-01-20 12:30:29 +01:00
Orgad Shaneh
15680ebe0c C++: Minor cleanup in lexer tests 
Use a typedef for the list

Change-Id: Ie921226f9b72fdbedd9926ae166979a4cd1ad540
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-01-20 12:30:17 +01:00
Tobias Hunger
7168dd48fe AnsiEscapeHandler: Use a dedicated struct in favor of a qPair 
Change-Id: I800d4868caf0cd58f83507ae2d0849d50f86a01f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-01-20 11:15:05 +01:00
hjk
8b99e5532f Debugger: Add facility to run dumper test with DYLD_IMAGE_SUFFIX 
Change-Id: I5f79436b61a3a04de9b7b669bece2204ac858edb
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-17 17:16:17 +01:00
hjk
6954144251 Debugger: Unify QTimeZone dumper autotest 
No real need to check the member if the summary is ok.
This also makes the test pass with Release builds.

Change-Id: Ie8ed9339b9f20f33a43d7dcc000f4a01d3e3710f
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-17 15:28:09 +01:00
hjk
59a45ffa77 Debugger: Fix QThread autotest with LLDB 
Change-Id: I90e93a15b8280a55c31db6be28fe6eb39c7babb0
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-17 12:39:14 +01:00