Commit Graph

1649 Commits

Author SHA1 Message Date
Orgad Shaneh
cb350bfeb2 C++: Rename ClassOrNamespace -> LookupScope
Change-Id: Ide74482b133dd1fec40a725d9aa81bd749385f37
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-04-20 14:51:56 +00:00
Orgad Shaneh
29ac9fc65f C++: Remove DeprecatedGenTemplateInstance
It's, well, deprecated...

Change-Id: Ie9d7e80345a8d9404f702dd877b3e940a1a49d93
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-04-20 13:37:35 +00:00
hjk
7d13400041 Debugger: Remove StdStream dumper test
This was testing a bool value, not a stream, and doing that wrong
on Windows.

Change-Id: I86b1aaea99e77b2aa3c37bb5c9c3e0ba8a90cb05
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-17 08:25:14 +00:00
Ulf Hermann
171d16c6fb Timeline: Be more exact about height of model aggregator
Only emit the change signal if the height has actually changed.

Change-Id: Ic4bf67f25cb4a7f204815b4e6b0c6bd88c71944a
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-16 13:33:03 +00:00
Ulf Hermann
7b1a421fbf Timeline: Test TimelineModelAggregator
Change-Id: I327a12212f6e0d842ed2c230a4d489a3178033d0
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-16 13:32:43 +00:00
Ulf Hermann
8425e198c1 Timeline: Be more exact about model height changes.
Emit the signal every time the height changes, but not if it doesn't.

Change-Id: I3a3da737bc99ae99ac6d5690c55c21d94cf5b647
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-16 13:03:25 +00:00
Eike Ziller
37fb296e72 FileSearch: Move FileIterator to std iterator semantics.
We need this when we want to use QtConcurrent::mappedReduced.

Change-Id: I4a6a31f4a0cc9a739a263cc148a1d51d7aa5d418
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-04-16 08:36:13 +00:00
hjk
ba947fbb9e Debugger: Fix handling of ? in dumper test
Normally, we use '?' as an optional Qt namespace qualification.
This clashes with the use of ? in a regexp type expression.
Re-order checks to avoid the clash.

Change-Id: I4a8aee0174f4f3d21bec624919856623808becb1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-16 07:42:34 +00:00
Eike Ziller
50fe3585a8 Merge remote-tracking branch 'origin/3.4'
Conflicts:
	src/libs/timeline/qml/MainView.qml
	src/plugins/git/gitclient.cpp

Change-Id: I0b6ec7b9a592014deb0dd2e1145b19dd6753b1c3
2015-04-15 17:45:47 +02:00
hjk
d3c06c9e4a Debugger: Make QUrl dumper test pass for LLDB on Linux
... by relaxing the namespace checks.

Change-Id: I2c2978fe4e95bdc87df24fd6ecbcba4bf1913df3
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 13:49:59 +00:00
hjk
7007bf4057 Debugger: Use a more generic approach to LLDB's namespace problem
This is a generalization of 134234be67. '?QFoo' is now meant to
match both 'QFoo' or 'Ns::QFoo' in a namespaced Qt. '@QFoo'
continues to match 'Ns::QFoo' only.

Change-Id: I4285cd9f75a2e4cd94ec5dbb107214f75a60c810
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 13:39:48 +00:00
hjk
aee5668b62 Debugger: Handle char const* and const char* the same in types
Helps recognition of default std::maps and makes the StdMapQt
dumper test pass with LLDB on Linux

Change-Id: I2d2a91d65e895c7fc2c99e24cc77d21ca6353b22
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 12:59:12 +00:00
Christian Stenger
62941c7b87 Tests: Fix parsing of gcc version on SuSE
Change-Id: Ieb8b5a1ea998abbd2d3baf13829f81f9d4cc43e5
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-15 11:58:35 +00:00
hjk
6965fc30b1 Debugger: Disable parts of QDate* dumper for GDB on 32 bit
Older versions of GDB (~GDB 7.4 on 32 bit) will cause segmentation
faults in inferior calls due to misaligned %ebx values in an SSE
call in qstring.cpp:findChar.

Change-Id: I44492106080f12e645f9d57828438ec70fd66ca6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 11:07:30 +00:00
Christian Stenger
ff81a1a754 Test: Dumper: Limit single check to Qt5.x
Change-Id: Ia769c16761a171e3e472144cd3ace3280ae5a6aa
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-15 08:58:44 +00:00
hjk
32aff7820f Debugger: Make QThread dumper test compile and pass on Mac
Change-Id: I094d3add58681cbc94a76cdc0d45040c705169e5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 08:11:50 +00:00
hjk
8c7d3c3a90 Debugger: Weaken QVariant(QUrl) test
... to make it pass with LLDB. The exact display of the private
is not *that* interesting anyways.

Change-Id: I2d0a8bdd5daff4b03c77b00c887837c7568ea508
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 07:46:20 +00:00
hjk
134234be67 Debugger: Workaround LLDB type handling failure on Linux
LLDB 3.7 on Linux doesn't get the namespace right in QMapNode:
sc t = lldb.target.FindFirstType('Myns::QMapNode<int, CustomStruct>')
sc t.GetName() -> QMapNode<int, CustomStruct> (no Myns::)

Change-Id: Ied306f70035e0669bc822700a92371b7de35a603
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 07:46:03 +00:00
hjk
e452ebde97 Debugger: Fix std::unordered_{map,set} dumper for LLDB on Linux
Change-Id: Id96d02cddcccdd7765e5a098bb98f894122781a1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 05:53:12 +00:00
Ulf Hermann
0df8cc2e02 Timeline: Clear excess row heights when reducing the number of rows
Otherwise, if you increase the number of rows again later you get
surprising results.

Change-Id: I3ec809820716368849415f9dcdb1ec9208844353
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-14 15:19:46 +00:00
hjk
c9cce0b541 Debugger: Simplify LLDB test loop handling
We know that we expect a frame with valid debug info.

Change-Id: I51079ca4db87df05c93464fd46e5add1f756cba7
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-14 09:41:10 +00:00
hjk
d73a5c9f88 Debugger: Fix GCC/LLDB anon struct test by adjusting expectations
Change-Id: I31775513c2e4a690b2620225682c89ee8c9156d2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-14 08:13:50 +00:00
hjk
53bd2e2ee9 Debugger: Improve normalization of types containing pointers
Always add a space before a *. This fixes some test cases with LLDB
that failed to recognize the default argument in "std::vector<int *,
std::allocator<int*> >" due to the different spacing.

Change-Id: Ib4a57a808551d0b4cd527021f7d19772378e405f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-14 05:55:22 +00:00
Christian Stenger
08ad4bef77 Tests: Robustify compile of debugger auto tests
Change-Id: I9deb837b693c433e3c865dda2b212129e193d63b
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-13 13:26:10 +00:00
hjk
300304de19 Debugger: Parse openSUSE's gdb version strings
Change-Id: I49cfb29a3d6ec2245ed05956bb2cd46c6a2338cc
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-13 12:41:43 +00:00
Eike Ziller
11590a8c5f Merge remote-tracking branch 'origin/3.4'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeproject.cpp

Change-Id: I09c5a047f7d91fecfc58c78df438afcdcdc0a8d7
2015-04-13 10:53:03 +02:00
Daniel Teske
08c573fb0d QmlProjectManager: Remove dependency on qt quick 1 in a test
Seems it wasn't actually required at all

Change-Id: I4c622057b7fd85a64f99368eb07b502aee524955
Task-number: QTCREATORBUG-14217
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-09 14:50:34 +00:00
Ulf Hermann
153a57ce80 Timeline: Test parenting of equal start times
If you insert events with equal start times in a way that the model can
not reorder them by their end times the parenting follows the indexes,
not the end times. This has caused confusion multiple times and it's
good to test it.

Change-Id: I3e9ba212ff377dc2afa2a2893637bb55edebafea
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-09 13:41:51 +00:00
hjk
bfac365ebb Debugger: Fix parameter passing to LLDB dumper tests
Change-Id: Iae342ffe68385de877c7a1e9a7e61e7d4889f731
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-02 14:56:32 +00:00
hjk
3417ffad83 Debugger: Make QHash dumper pass again
Failures were due to version specific reordering. This is still
checked in cases h1, h7, h8. Simplify maintanance by removing the
check in the other cases.

Change-Id: I481672e693f6370c75bc4739d6cca937b9f027ea
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-02 14:07:30 +00:00
hjk
e6f73164c3 Debugger: Adjust QVariant2 dumper test
Take new QPolygon{,F} dumpers into account, also make QUrlPrivate
field accessible,

Change-Id: I2b5c122895c3ee389ba939eaeffcd613fa206009
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-02 14:07:24 +00:00
David Schulz
28c06b5b58 Test: Dumper: Adjust QVector test to cdb output.
Change-Id: I2da7f4b21251e1417efaf20813ce260ea286b1f2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-02 13:24:37 +00:00
David Schulz
8548343ef4 Test: Dumper: Fix Compilation and adjust cdb output of "BigInt" test.
Change-Id: I8ecfd77cd72e155e291acdc96fcbfd49572c91e3
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-02 13:07:30 +00:00
Nikita Baryshnikov
ed9104bad6 TstPluginspec: fix compilation
Change-Id: Ic89b06f60231a4a2bee815dacf6c9fce0818566a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-01 13:03:49 +00:00
David Schulz
1aa8c5258f Test: Dumper: Adjust test to cdb output.
Change-Id: Iae81984eedeb4f7190268eb5d19fb652e76f8f34
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-31 13:25:36 +00:00
David Schulz
12cd3839a6 Cdbext: Fix QByteArray dumper for unprintable characters.
Change-Id: I7075df252ea9739600fdbf01c27987d2c0f8d159
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-30 05:18:45 +00:00
hjk
0c2a1ab3be Debugger: Adjust QFile dumper to library changes
Change-Id: I44ac0de970a41fc7da0453ed853396a6943ffb0b
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-24 12:51:03 +00:00
Ulf Hermann
d57c7e14fe Timeline: In autotests, fail if the renderer warns
Warnings from the scene graph renderer are most likely things we want
to catch when testing, such as failure to compile the shaders.

Change-Id: I96bcf4a44d0986ca6f065cda71b242ebb355ce84
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-03-24 11:23:17 +00:00
David Schulz
0b6b5631b7 Tests: Dumper: Fix QByteArray dumper test for cdb.
Change-Id: Ic5cdf0092d720bc13c1609b6e489e48712645f8b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-23 08:48:46 +00:00
David Schulz
81a70627a4 Tests: Dumper: Add current data tag to tmp build dir name.
Change-Id: I91c26bcb70a10ed00c32f8bf18f16e0ac449c5b6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-19 07:24:09 +00:00
hjk
e8f8aaa263 Debugger: Fix dumper format choosing with GDB
... and further unify GDB and LLDB code paths.

Change-Id: Id89f3804c53190c4888082891fd3c3c55eceac84
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-19 06:59:01 +00:00
Christian Stenger
3cd9bbb550 Tests: Fix building
Change-Id: I381bb020b75fbc7e43bff6bd2fef5982ed114c14
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-17 10:00:35 +00:00
Orgad Shaneh
b1e839c21b Tests: Cleanup project files for Utils tests
Change-Id: I75ad17d12994376d88117570250a6c45e7495fea
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-17 09:39:19 +00:00
Orgad Shaneh
cde50f23fc Tests: Fix compilation
Change-Id: I7cb3b5636413abfc52578e8ae0c43f745efa2f0d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-14 17:26:12 +00:00
Orgad Shaneh
a341094a68 C++: Fix preprocessing of comments within function-like macro
Task-number: QTCREATORBUG-9535
Change-Id: Ifd94f674214314b3694be74cca297ddab873cd8c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-03-13 14:34:07 +00:00
Nikolai Kosjar
4e1d281963 C++: Fix crash on invalid function qualified name
Task-number: QTCREATORBUG-14135
Change-Id: I94e850f729bd3dbf4212960c7a980a1f118030b4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-13 13:21:04 +00:00
Orgad Shaneh
c9b71a268b C++: Provide better output on preprocessor test failure
Make the expected output copyable to the test.

Change-Id: I4fc61682f14d0de054a11d2ffa4a0f36ede0e500
Reviewed-by: Francois Ferrand <thetypz@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-03-13 11:28:11 +00:00
Christian Stenger
14a02d5081 Debugger: Tests: Fix execution of dumper tests on OSX
Change-Id: Ibe3e447d29e3834766ef067ba4424c3b08ba5eb1
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-10 08:55:14 +00:00
Friedemann Kleint
1b9be30371 Clean headers in lib qmljs and plugins qmljstools, qmljseditor.
Change-Id: I3256db8f4d42b6326d986d754b45e6c6c2030839
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-05 08:17:10 +00:00
hjk
46d515529a Tests: Use real project dependencies in memcheck test
Change-Id: Iced26e5b2a4a4ba5e1075e19eeffe96b2e298d0f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-04 14:03:29 +00:00