feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
27,509 Commits 108 Branches 368 Tags
76bf971cb9545793d56bc7805622a4d5d4871711
Commit Graph

2079 Commits

Author SHA1 Message Date
Erik Verbruggen
19f1f6ca79 Added test for lambda function definitions. 
Change-Id: I2233aa98a07e9c23463d4bec0b09dcccb89deb58
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-03-20 14:28:51 +01:00
Francois Ferrand
2386d701b6 Preprocessor: fix line for generated code. 
The macro used to be at the same line as the first token after the
closing parenthesis.

Change-Id: I4c2d7317632baf612900e84572017aeb247d0585
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2012-03-19 10:48:43 +01:00
Francois Ferrand
558b6e08ae Preprocessor: fix expanding macro arguments. 
Expanding macro arguments can add or remove argument for a nested macro,
so the actual parameters list was not correct.

Also, remove unused arguments reference list and reserve space for the
expected number of arguments.

Change-Id: I4cf369cbb3909927c6bf65750bd715fa6f070fad
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2012-03-19 10:35:21 +01:00
Francois Ferrand
3e9105e401 Preprocessor: fix handling of first empty argument. 
First empty argument used to be dropped: e.g. MACRO(,test) would be
expanded with one parameter only, with value 'test'.

Change-Id: I693fbb7faf1360f62266fa04c4b39c2de0d159a7
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2012-03-19 10:33:14 +01:00
Francois Ferrand
ffd58c577a Preprocessor: Handle variadic arguments (__VA_ARGS__). 
Change-Id: I69aa6c5e01ea97a4413f77f20ebbb4d4beb971aa
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2012-03-19 10:31:09 +01:00
hjk
bb63ec80eb debugger: some adjustments to semi-automated tests 
Change-Id: I6512841797aa055630a984bc4bd75d6869ed2bf6
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-15 16:38:28 +01:00
Eike Ziller
e5e3f91ed2 Merge remote-tracking branch 'origin/2.5' 
Conflicts:
	src/libs/qmljsdebugclient/qmlprofilereventlist.cpp

Change-Id: Ic6251d47ecd032ea1db4fc58dc80e19b6e6cf23d
 2012-03-15 15:01:54 +01:00
hjk
be4adfac23 debugger: adapt autotest to recognize qnx 
Change-Id: I5fa9c0b1aa900361b346d35e4f5c4c26658f8b14
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-15 11:35:21 +01:00
hjk
8e94d06496 debugger: add another dynamic type test 
Task-number: QTCREATORBUG-6863

Change-Id: I94c0701a3ef0ebf6e166f3a65ccafef146549641
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-14 19:31:03 +01:00
hjk
4ab8925bc6 debugger: add manual test for QObject properties 
Task-number: QTCREATORBUG-6863
Change-Id: I88c57d7255ebb41d2069af62b5b066b9b26be8b7
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-14 14:40:24 +01:00
Erik Verbruggen
3a231e734c Cleanup testcase. 
Change-Id: I3db86fa5df4a2747f4c24e0414279dab59098c54
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-03-13 12:00:43 +01:00
Robert Loehning
48b4abe877 debugger: Improved testInput 
Change-Id: I3920bf0ee69a5abbdd0060ca309f6fd7e17b2e1b
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-12 14:20:33 +01:00
Robert Loehning
79b0ff8186 Squish: Updated checking for created files 
Done-with: Christian Stenger

Change-Id: I533ff2f41a5d6554d0f6a880d1ede093de2f9d6c
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-03-09 17:42:46 +01:00
Robert Loehning
aa6571ba01 debugger: Added some vars to testFinal, so the debugger can show locals 
Change-Id: I4b63bde13a9a74d50e654bcc167b7f19fec48919
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-09 14:48:42 +01:00
Oswald Buddenhagen
a5063e6ba4 Merge remote-tracking branch 'origin/2.5' 
needed due to QA-related changes.

Change-Id: Ie29699fa9dc494dc3849175ccf9523377efcb1e9
 2012-03-08 16:29:05 +01:00
Robert Loehning
0949e7528b Squish: String updates 
Change-Id: Ic513a4cd10460d177b0305e53a4ed55b7c75e541
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-03-08 16:04:56 +01:00
Robert Loehning
abd62116f8 Squish: Removed unneeded workaround 
Change-Id: I38fc9742fa4b26a694d8bcaddabaf0ceddb48d7c
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-03-08 16:04:43 +01:00
Robert Loehning
71466f53d8 Squish: Updated object map for changed strings 
Change-Id: Iacc385d9c62a3c376e105223df5dc9424c85e1f1
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-03-08 14:14:41 +01:00
Christian Stenger
933592e6a7 Squish: Add debug output on fail 
Change-Id: I6ccf33aca23a819ef19ac148b27e36d40854b4cb
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-03-08 09:01:53 +01:00
hjk
3f369366a0 debugger: fix manual test 
Change-Id: I7e3517d69957e7d2c7d3b14f76f260762ff980e9
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-08 08:57:37 +01:00
Eike Ziller
4b8df15f3d Merge remote-tracking branch 'origin/2.5' 
Conflicts:
	src/plugins/remotelinux/startgdbserverdialog.cpp

Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
 2012-03-08 07:48:55 +01:00
Christian Stenger
3a808b0fd8 Squish: Proxy handling to avoid Jenkins fatals 
Change-Id: I89f13b9cf8887168291a29a30288affb1b46dd11
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-03-07 16:43:42 +01:00
Christian Kamm
ab64c1aef3 QmlJS indenter: Improve indentation of function expressions. 
As discussed with Tor Arne and Fawzi in
http://codereview.qt-project.org/#change,18080

Change-Id: Ia0482d2ed3ddd61fa002e2c76b948301af52a795
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2012-03-06 17:26:46 +01:00
Robert Loehning
b41171c847 Normalized connect()s 
Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-03-06 12:46:52 +01:00
Robert Loehning
08f9d72c51 Squish: Skipping unstable test on Mac 
Change-Id: Icf8e78487d2e734c79aa2b93401a911769a9545e
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-03-06 11:02:16 +01:00
Robert Loehning
c283323afd Squish: Fixed searching for external tools 
Change-Id: Iad16f3e7a7a4c886bcd2b7eb9bf94ded9926d37f
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-03-05 17:58:15 +01:00
hjk
98565438c3 debugger: fix QDir gdb pretty printer for Qt 4.8 
Change-Id: Iff0f28b37abed29920379302dc540d46588fc787
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-05 17:18:42 +01:00
hjk
a913f3f68c debugger: small fixes for semi-automated tests 
Change-Id: I3e2b14aae33ef9cec43c5cea947360e75e19c2c1
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-05 17:18:16 +01:00
hjk
ce6a80f337 debugger: extend semi-automanated tests to one level of expansion 
Change-Id: I9063f4eecfe4c42926771cc46539932b4e353b8d
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-05 17:17:51 +01:00
Eike Ziller
9c9316b9e7 Merge remote-tracking branch 'origin/2.5' 2012-03-05 13:48:48 +01:00
hjk
709f24b0e0 debugger: fix QDir gdb pretty printer for Qt 4.8 
Change-Id: Iff0f28b37abed29920379302dc540d46588fc787
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-05 10:59:01 +01:00
hjk
3c16aaf568 debugger: small fixes for semi-automated tests 
Change-Id: I3e2b14aae33ef9cec43c5cea947360e75e19c2c1
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-05 10:58:14 +01:00
Christian Stenger
bf993e1fda Squish: Fix change to upper-case 
Change-Id: I8ce23ea8cc846001d207fc42cb53c02bf9a1b6d5
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-03-05 10:47:30 +01:00
Christian Stenger
b3e9343c1d Squish: Added time saver 
This avoids fetching the status and resolution again
and again for a test case.

Change-Id: I9445d329eb127830352add23e8ff0b5e2b9adbe6
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-03-05 09:09:34 +01:00
Eike Ziller
09e0c4899b Merge remote-tracking branch 'origin/2.5' 2012-03-05 08:59:13 +01:00
Kai Koehne
af205ab25d Add TcpPortsGatherer to utils 
Can be used to check (non-intrusively) which TCP ports are still available.

Change-Id: I61300f6b7215cb2c0e4a3e6135de305cfd38b5a9
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-02 18:37:39 +01:00
hjk
7a9ed9b72a debugger: fix special case of uninitialized data in manual test 
Change-Id: I9489f390008d5fbf73b3e151e9f1d86262d97905
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-02 16:00:28 +01:00
Christian Kamm
658e80d1b8 QmlJS indenter: Improve handling of function expressions. 
Task-number: QTCREATORBUG-7001

Change-Id: I254b84153b042c81008314bbebc800edfe201b89
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
(cherry picked from commit fcaf3d4f4c)
 2012-03-01 17:00:02 +01:00
Robert Loehning
ff58b3102c QmlJS indenter: Fix hang with invalid code. 
Task-number: QTCREATORBUG-7005

(cherry picked from commit 0c597a6f07)

Change-Id: I2e343fbcc6931530e7db142bf6e268dac696970f
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2012-03-01 08:27:40 +01:00
Eike Ziller
dd2309fa45 Merge remote-tracking branch 'origin/2.5' 2012-02-29 17:14:44 +01:00
Christian Kamm
fcaf3d4f4c QmlJS indenter: Improve handling of function expressions. 
Task-number: QTCREATORBUG-7001

Change-Id: I254b84153b042c81008314bbebc800edfe201b89
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2012-02-29 14:14:03 +01:00
Robert Loehning
3aaa3b3fa4 Squish: Fixed handling of targets 
Done-with: Christian Stenger

Change-Id: Iaa03a3df2151706bbe5d508a20f70a5007817d4d
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-29 13:28:09 +01:00
Christian Kamm
0c597a6f07 QmlJS indenter: Fix hang with invalid code. 
Task-number: QTCREATORBUG-7005

Change-Id: I095c3714d28b632cf814065c4be2262c8d009d00
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2012-02-29 10:13:53 +01:00
hjk
dc67ea9292 debugger: add pretty printer for std::shared_ptr 
... and polish the std::unique_ptr dumper.

Change-Id: Icbfb7241ae535e833dd983921da6e16fdb2225db
Reviewed-by: hjk <qthjk@ovi.com>
 2012-02-28 23:30:02 +01:00
Christian Kamm
06e6d88b81 Fix compilation of QmlJS code formatter test. 
Done by moving ITextMark and ITextMarkable from itexteditor.h
to itextmark.h. The test uses parts of the texteditor plugin by
compiling some of its files. For that to work, the code has to be
fairly stand-alone. The reference to EditorManager in
itexteditor.cpp broke it.

Long term, the test should become a plugin based test to avoid this
kind of problem.

Change-Id: Ibae3bcd7365eb4e2814cd07011cad0180507e82b
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2012-02-28 15:47:11 +01:00
Robert Loehning
f92b8486af Squish: Working around QTCREATORBUG-7002 
Change-Id: If575398e4ea9f7dcd4b31ebdf49708f2b2dcbc15
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-28 14:35:38 +01:00
Christian Stenger
25decf2052 Squish: Fixing Mac 
* removed unused object
* refactored invokeMenuItem()
* always lookup cppwindow to avoid failing type()
* use objects stored inside objects.map to avoid LookupError
* reverted raising timeout to 60s
* added workaround for missing focus on Mac right after
  startApplication()
* removed the need to have a shell-script called 'qtcreator'
  (make sure to add 'Qt Creator.app' as AUT now)

Change-Id: I21511d810deedf31dfb19b896edd21b79e73b755
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-28 14:33:19 +01:00
hjk
6d0231c7ec debugger: move defines to a .pro file that is actually looked at 
Change-Id: Ic14fe35a6a16093117d89ef83c55d7a8bf29a137
Reviewed-by: hjk <qthjk@ovi.com>
 2012-02-28 12:01:35 +01:00
Erik Verbruggen
a621c99a0f [C++] Add error recovery for namespace declarations. 
Change-Id: I884ff9901c95467524e5eba38e91f75992d30e14
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Flex Ferrum <flexferrum@gmail.com>
 2012-02-28 10:22:31 +01:00
Bill King
2c7e68e6f7 Handle situation where applications are in C:\Program Files 
Change-Id: I9d99aac111ae2d630bfb21d4ce39df2d184709f2
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-27 22:00:43 +01:00