Commit Graph

8032 Commits

Author SHA1 Message Date
Eike Ziller
8a77eacf8d Merge remote-tracking branch 'origin/4.0'
Change-Id: Ied609608f6b12aa923c67777bc5a273c4d8fbcbb
2016-04-15 10:07:55 +02:00
Sune Vuorela
55bfa4401f Keep readonly qualifier
Let's not reformat readonly qualifiers away. They are likely there for a
reason.

Task-number: QTCREATORBUG-15745
Change-Id: Iaab7a8edb47fccd0cf36759750500a93be45bbc2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-04-13 07:59:44 +00:00
hjk
c0c5aad8e6 Debugger: Adapt dumper test to base class sorting
Fallout from e73a9c1b0d.

Change-Id: If06ba8424bd264137dcdcdd721317ce6785a91b0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-12 14:05:38 +00:00
David Schulz
54a51979c0 Fix std::list dumper test for cdb.
Change-Id: I071b4c918cf6d236110c48085af607f8ff578e30
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-12 13:55:36 +00:00
Eike Ziller
817db22fb9 mapReduce: Add remaining API use cases from QtConcurrent
- simpler mapReduce
- blocking mappedReduced
- map with iterators
- blocking mapped

The special QtConcurrent::map for modifying the container is not needed
(it simply is Utils::map with a map function that takes a reference to a
value, and either non-const iterators or a std::ref container).

The special (blocking)filter((ed)Reduced) is simply done with the
Utils::map(ped)/map(ped)Reduce(d) functions with a map function that
takes a QFutureInterface and only reports values if the value should not
be filtered out. That way it can also be used as a
"filteredMappedReduced".

Change-Id: Id8dcbb7277be4d0e27b9e1691df35535dd481924
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-04-12 12:28:15 +00:00
Eike Ziller
12ef434e40 mapReduce: Allow init and cleanup functions without future interface
Change-Id: I49c5f66877db6f7a3b5d175e9ee333451b25d4de
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-04-12 12:27:59 +00:00
Eike Ziller
5c87432260 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp

Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f
2016-04-12 11:34:46 +02:00
Orgad Shaneh
46739bcdf3 Qbs: Add offsets autotest
Change-Id: Ibb918466c057030e1dddd4a2e84e56de5cdbae64
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
2016-04-11 19:34:19 +00:00
Orgad Shaneh
392ca26287 Debugger: Minor cleanup in offset tests
* Remove unneeded STRINGIFY macro
* Add :: between class and member in test names
* Remove extra comma

Change-Id: I5a5e9d318133934885c0bdf6aefc1fd3abc2acb0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-11 05:05:20 +00:00
hjk
feecfcbc3a Debugger: Avoid #define private public in auto tests
Change-Id: Ie8d9c7745a45fef1de2c446a78faf9096b1c7bb0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-04-08 13:08:55 +00:00
hjk
e9b1e493c2 Debugger: Move struct sorting logic to generic parser
Backends only have to specify whether an object members are sortable
in principle (e.g. all structs), and some numeric 'sortgroup' value
for member items (higher values are always sorted on top).

Change-Id: I10ce94580374fed48a35f058a575a1408d6801af
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-08 10:22:31 +00:00
David Schulz
9ceb9cd777 CdbExt: Add valarray dumper.
Change-Id: I9d05fc9217d014b011223d0739ed2267ae7ca479
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-08 08:47:30 +00:00
Robert Loehning
ca66ad3d0c Squish: Expect missing breakpoints in qml
Task-number: QTCREATORBUG-15806
Change-Id: Id7b5966a4ae6fafe979f7373718b89fdcc2b918b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-07 14:40:59 +00:00
Robert Loehning
25919d9020 Squish: Don't crash when missing breakpoint
Change-Id: I8eba72baa043bebc8618fbfe51fa31d7215165e7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-07 11:11:54 +00:00
Robert Loehning
513cc235fe Squish: Clean up expected fails
Change-Id: I216c6f6453412e65c48ddceaf950bd1112c32a42
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-07 10:29:30 +00:00
Robert Loehning
30541d0213 Squish: Don't expect fail anymore in HELP02
Change-Id: Iba979f099b31a35693d0fee49de86fe6b8b3c55c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-07 09:33:00 +00:00
Robert Loehning
78c3fcc160 Squish: Small cleanup
Change-Id: I8ca788b28612568935dcf68bc57089c0a0174fb1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-07 09:31:57 +00:00
Christian Stenger
6ffbb88b7b Squish: Adapt to changed tool tip
Change-Id: Ib6f01cdad6a8e54010ad455cb7e9322d6311dc12
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2016-04-06 15:16:47 +00:00
Christian Stenger
f862583f23 Tests: Fix crash in qml codemodel check
The test accesses indirectly the static instance of the
QmlJS::ModelManagerInterface which is not instantiated at all and
leads to a crash of the test.

Change-Id: I2b047e1ee8d679dd3764ca5c36709b599161a60c
Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-04-06 09:03:10 +00:00
hjk
b7d8d9ba3a Debugger: Add a QBitArray dumper
Task-number: QTCREATORBUG-15974
Change-Id: Iafb0d94f5d780b3165d8bb749429754a5de051e3
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-04-06 06:20:04 +00:00
hjk
0408aee321 Debugger: Add dumper for std::valarray
Change-Id: I80d6a11714777d813dc0a6917a4dfa826d013cb9
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-04-06 06:18:40 +00:00
Eike Ziller
1ae483fc83 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	src/libs/utils/tcpportsgatherer.h

Change-Id: I495f3e05789f09efb8b1e84827893423a5b5b60c
2016-04-05 14:11:47 +02:00
Christian Stenger
f7a1c1caa0 Squish: Disable testing QmlJS console
This has changed too much and must be rewritten.
Due to other issues this is not easily doable, so disabling this
test for now.

Task-number: QTCREATORBUG-15831
Change-Id: If0c7866b1f68a32c0696636fc76aed9bbe2ea921
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2016-04-05 10:21:13 +00:00
Christian Stenger
4c5163f675 Squish: Ensure clean state after test run...
...depending on the environment and the present terminal variations
it might be possible that QC leaves terminals with still running
qtcreator_process_stubs open.
Ensure to kill these (and automatically close their terminals).

Task-number: QTCREATORBUG-15749
Change-Id: I0cdbaf000c355443289bf827034ad9884efc2ce7
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2016-04-04 14:06:17 +00:00
Kai Koehne
dc16ca8552 Remove tcpportsgatherer
Has not been used since a while.

Change-Id: I53cf42d723c2f4d822ad63923b857f119e5cfa58
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-04-04 11:19:42 +00:00
Eike Ziller
4996be216d mapReduce: Option for ordered reduce
Change-Id: Ifdf6535315e2032aa5d9d2b56587e27b5dc4b450
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-04-04 10:51:25 +00:00
Oswald Buddenhagen
e426d08e54 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I81b43480a1369e3d7be60ae26e812dda6b962b0b
2016-04-01 17:31:39 +02:00
Robert Loehning
59c260d60a Squish: Update Readme
Change-Id: I0588e18ac23a72c596a24e5144c8f531dabbfc8b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-01 09:56:29 +00:00
Robert Loehning
483fcb6ab7 Squish: Update object in tst_session_handling
Change-Id: Ia1f327cf2a69e74d242bf4ad7d7ed8cfd7cd3a34
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-31 13:35:15 +00:00
Robert Loehning
d0ad71bb18 Squish: Sort objects
Change-Id: Iff9e700d1c4f392a019803efc407709dd7ccf181
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-31 13:31:50 +00:00
Robert Loehning
180c0a2883 Squish: Expect more fails with clang code model
Task-number: QTCREATORBUG-15710
Change-Id: I9a074921d6521fa11a281c0e2d296666ca86ef51
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-31 10:26:02 +00:00
Robert Loehning
93da73ffce Squish: Update objects for tst_qml_locals
Change-Id: Iddc266417f9e1d5ba1ecdddb46f62f820c921b20
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-31 10:25:52 +00:00
Robert Loehning
39e8698290 Squish: Update suite_WELP
Change-Id: Iba47a015eb87ad759933dc51bacceaf29d3da57c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-31 10:25:43 +00:00
Robert Loehning
db2ab92801 Squish: Remove outdated code
Creator can't be built with Qt 5.4 anymore.

Change-Id: Ic3c014e8384c72c10a48c65117c53daecaa683ab
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-31 10:25:32 +00:00
Christian Stenger
9905eb6f75 Dumper: Fix fileName offset for Qt5.5 on 32bit
Change-Id: Iffd6d70c7d283b932f8946447b27f3e7ba1f5e98
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-31 05:29:47 +00:00
hjk
39a38d5679 Wholesale conversion to #pragma once
Kudos to cgmb and https://github.com/cgmb/guardonce

Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-30 15:20:19 +00:00
Tim Jenssen
61411f9415 Keep QT_RESTRICTED_CAST_FROM_ASCII in the designer
There is no reason to undefine QT_RESTRICTED_CAST_FROM_ASCII (anymore).

Change-Id: Iabeacc8a89d662e78986e2dc275c2096a9c9e519
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-03-23 11:57:42 +00:00
Oswald Buddenhagen
3c2f0096ea Merge remote-tracking branch 'origin/4.0' 2016-03-22 15:23:12 +01:00
Christian Kandeler
ed224796f1 Fix autotests build.
Change-Id: I5b0ea5df0a7321c6938146a5a03b089c837ff642
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-22 14:19:07 +00:00
Orgad Shaneh
6a76d054a3 Tests: Fix offsets compilation with Qt < 5.7
Use private member access method from:
http://bloglitb.blogspot.com/2011/12/access-to-private-members-
safer.html

Enable boost tests also for Qt 5.7.

Change-Id: I8641a9549a341be49890c5b0d88d2b7e9937abb7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-22 07:40:58 +00:00
hjk
7543588433 Debugger: Make offset test compilable with Qt 5.7
We can't disable C++11 anymore, disable the boost test instead.

Change-Id: I68e39a348b35ce7c37abac633d3ea68526f0ff2d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-21 10:23:32 +00:00
hjk
abbd94e4b9 Make tst_qtcprocess.cpp compilable with default restrictions
Enabling use of QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS
QT_NO_CAST_TO_ASCII QT_RESTRICTED_CAST_FROM_ASCII is straightforward
nowadays.

Change-Id: Ie4928b514049388401493de46e418790bb928a54
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-21 07:27:32 +00:00
hjk
fb9cc36e9f Debugger: Remove QT_NO_CAST_FROM_ASCII from tests
The intent is covert by the global QT_RESTRICTED_CAST_FROM_ASCII
nowadays.

Change-Id: Icf1bcb6e88042376382e32f31a0ebe2afb5f203d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-21 07:25:39 +00:00
Orgad Shaneh
e5262fba5f Qbs: Remove versions validation from some tests
Qt < 5.4 is not supported for building.

Change-Id: I8b008da5f21dc13c36fea535ea8e468ad252fd5a
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
2016-03-21 07:07:30 +00:00
Robert Loehning
e7fe1ea41b Squish: Update expected file in tst_git_clone
jom changed

Change-Id: I5d0bebe8a6d4711c98aa38b7db21fdc16d6639b7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-18 15:30:38 +00:00
Ulf Hermann
7e03cbd8a0 Timeline: Allow setting the timeline model's displayName
This makes a lot of things easier. There is no real reason for it to be
const.

Change-Id: I426a2cbcfce6eae7cf7fabc28ab63098885324b8
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-03-17 09:25:24 +00:00
Eike Ziller
f1e14468c6 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	src/plugins/coreplugin/find/findtoolbar.h

Change-Id: I7db695a28473d1b16c46b1e39a4d6fce537c13a1
2016-03-16 15:28:47 +01:00
Christian Stenger
2123ce49a2 Debugger: Make manual tests compilable on OSX
Change-Id: I1a17677bf5636addcbb291097613006d0324070c
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-16 09:20:52 +00:00
hjk
41a24ade75 Debugger: Make manual tests compilable without Qt Script.
Change-Id: I9464ce8dfc22e107c8f97a139092f0a9a338bbf2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-16 09:10:29 +00:00
Eike Ziller
450d4c4c84 Merge remote-tracking branch 'origin/4.0'
Change-Id: I7cca91daebb92c245ef49a198e1e6303311194fa
2016-03-11 11:25:27 +01:00