feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
74,059 Commits 108 Branches 368 Tags
644b51a699c98fbcd47d89c59404e3b4f12d8a92
Commit Graph

6686 Commits

Author SHA1 Message Date
Christian Stenger
cd4ce50a3b Squish: Fix changed values 
These values have changed (see src/plugins/projectexplorer/taskmodel.h)

Change-Id: I7b351cfae2bceca782ea022b855d86926e942d53
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-03-23 16:53:10 +01:00
Oswald Buddenhagen
dbcaadd8af Merge remote-tracking branch 'origin/2.5' 
Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/qtsupport/gettingstartedwelcomepage.cpp

Change-Id: I9157b9b9c05564ddeb3c72cec6b59523b8165d76
 2012-03-22 15:09:50 +01:00
Robert Loehning
39cb4e954d debugger: Removed unneeded failing test 
Change-Id: I330d43bfdbba5304bf559e136aa1bc07b5498c4a
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-21 18:08:13 +01:00
Robert Loehning
9bdb8955e1 debugger: Updated self-test 
Change-Id: I065de900e79ee4a73f3056ed764391ef45adde19
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-21 10:19:28 +01:00
Eike Ziller
7931159c09 Merge remote-tracking branch 'origin/2.5' 
Conflicts:
	src/libs/qmljsdebugclient/qmlprofilereventlist.cpp
	src/libs/zeroconf/servicebrowser.cpp
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qmlprofilerengine.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp
	src/plugins/qmlprofiler/qmlprofilertraceview.h
	src/plugins/qmlprofiler/tracewindow.cpp

Change-Id: Ib5e7579efffe74f2bf6871690d1e398e1062f986
 2012-03-21 09:57:56 +01:00
Robert Loehning
7f21eb8b4d debugger: continue after breakpoint in self-test 
Done-by: hjk

Change-Id: I8405f88c963df359a9ae7f2a779ef0401b3c5994
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-20 16:29:40 +01:00
Robert Loehning
47fe6ab600 debugger: Added comment how to make USE_AUTORUN usable 
Task-number: QTCREATORBUG-6951

Change-Id: Ib271f8f2c22705dae5cb799454ee52c22c5bec9d
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-20 16:00:54 +01:00
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