feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
35,206 Commits 108 Branches 368 Tags
45361755f997a2a2714c95be73dda3900b51fd03
Commit Graph

2960 Commits

Author SHA1 Message Date
Robert Loehning
791a196f1d Squish: Always using menu to close Creator 
Change-Id: I9f8019a23ad96baa865c74721fb8712d612adb81
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-04-04 13:14:43 +02:00
Jan Kerekes
2ece74469c Added new test cases/suite for complex project compilation 
initial commit

Change-Id: Iefa2e05b4dcd70d599bbf4c7de1ae230cd8f0450
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-04-04 10:28:23 +02:00
Eike Ziller
078d570721 Merge remote-tracking branch 'origin/2.5' 
Conflicts:
	share/share.qbs

Change-Id: Ia64573d1a69b9063fee32496a3f0a00926a3dadd
 2012-04-03 10:03:52 +02:00
Orgad Shaneh
8d5d1f2f66 Dumper test: Add member to Derived 
Change-Id: I324d31f9bfe98689136bb9e9ed40dfe46fa9ca81
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-03 09:25:14 +02:00
Christian Stenger
a96cbcf335 Squish: Small fixes for utils.py 
* invokeMenuItem(): changed order and additional
  waitFor to be more error-proof on Mac
* logApplicationOutput(): added try/except block
  for cases where no former run/debug could be found

Change-Id: I0d434fbb964e3d85e5ccb2a4c336e14e956f44ce
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-02 18:10:46 +02:00
Francois Ferrand
68471c2100 Preprocessor: fix macro definition line. 
The line corresponding to the macro definition is simply the token's
line. This caused errors in the macro definitions, since there were
multiple macros defined on the same line of the same file.

Task-number: QTCREATORBUG-7217
Change-Id: I56d17eeba677ac51f9eed283c0e964019bdfe4b7
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-04-02 17:01:52 +02:00
Jan Kerekes
5254e3e547 Added new test cases/suite for simple project compilation 
initial commit

Change-Id: I06d211ba9878852839cd4774b930efd8cde244ae
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-02 15:38:21 +02:00
Christian Stenger
7e4e06796e Squish: Small fixes for runAndCloseApp() 
Change-Id: I74136202c2d5e482a18a56ea2c0ba11d9d958574
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-02 15:30:03 +02:00
Francois Ferrand
1a10bcdaad Add test case to preprocessor. 
- This enables some tests which had been unexpectedly disabled in
earlier test.
- Tests to show issue QTCREATORBUG-7225.
- Tests which validates somehow behavior of preprocessor for
QTCREATORBUG-7217: the test passes, so the problem is likely not in the
startExpandingMacro() notification.

Change-Id: Ib7c1433e4dcdd8c1d19fa117371f94c1645ec3fb
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-04-02 15:16:25 +02:00
Francois Ferrand
332072019a Preprocessor: Fix client notification. 
- Notify end of macro if function expansion is skipped.
- Do not notify client of generated macros expansion.

Change-Id: Ic027fc13ee391425a5ebadc8e84b9305912dbcf0
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-04-02 13:49:00 +02:00
Christian Kandeler
62280a219b SSH: Update tests. 
- Adapt to recent API change.
- Take into account that some shells don't report the "killed" signal.
- Take into account that cat and sleep are built-ins in some shells.

Change-Id: Ib33d89c65641340d704f88114834085b4c9b0e8b
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2012-03-31 11:43:19 +02:00
Christian Stenger
f3fd47f601 Squish: Introduce new helper function 
Change-Id: I6ef3022e7053c1e4993cc4276ccd2502de196754
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-03-30 18:20:04 +02:00
Robert Loehning
042dae0e5e Squish: Waiting for enabled button 
Change-Id: If06bb6360c7837e773e2eb0b6be8143e588b771e
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-03-30 14:55:03 +02:00
Erik Verbruggen
ff0a465403 [C++] Always output a #line as first line of the pp output. 
Change-Id: I60d25109ae8fe3628b1899078a21010263787c33
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-03-30 13:24:36 +02:00
Erik Verbruggen
2a74097b54 Fix #include MACRO_NAME. 
Change-Id: Id1c4046d028ad26d17b28feb53a832f3b48363f1
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2012-03-29 17:17:00 +02:00
Erik Verbruggen
60db573660 [C++] Rewrite of the preprocessor. 
This rewrite fixes a couple of issues with the pre-processor. It now
supports:
- macros in macro bodies
- stringification of parameters [cpp.stringize]
- the concatenation operator [cpp.concat]
- #include MACRO_HERE
- defined() inside macro bodies used in pp-conditions.

Change-Id: Ifdb78041fb6afadf44f939a4bd66ce2832b8601f
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-03-29 14:28:17 +02:00
Eike Ziller
8f6d915948 Merge remote-tracking branch 'origin/2.5' 2012-03-28 16:31:29 +02:00
Christian Stenger
857261f99d Squish: Improve openQmakeProject() 
Change-Id: I847604f81d1bdb10a56360af3d0969e451b3344c
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-03-28 15:27:38 +02:00
Erik Verbruggen
275e207d26 Fix invalid decltype error recovery which resulted in crashes. 
Task-number: QTCREATORBUG-7174

Change-Id: I653db71adc45586cd8518ffd96118425fd3763be
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-03-28 13:41:48 +02:00
hjk
66cf82a457 debugger: add test code for multi-process debugging 
Change-Id: I10a419a5dc538d4d42bab7f3f2070430db388eed
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-28 09:32:00 +02:00
Robert Loehning
f3bb330ea0 Squish: Further improvement of switchViewTo() 
Change-Id: I25f857f05120882427a8ba7569a4c1b66c474f5e
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-03-27 16:28:19 +02:00
Christian Stenger
5ce804b53b Squish: Add Qt4.8 to qtversions.xml 
This is just a preparation for the next patch.

Change-Id: Icac8584029b4119ebbc70f2cb5766768a61e21a8
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-03-27 14:04:34 +02:00
Robert Loehning
ae070f3277 Squish: Fixed issues in switchViewTo() 
Change-Id: I693ad1bf30c8644f07bd4188178cb96d374a3ea1
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-03-26 18:37:37 +02:00
Oswald Buddenhagen
51988bb5e0 Merge remote-tracking branch 'origin/2.5' 2012-03-23 17:50:29 +01:00
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