feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
24,819 Commits 108 Branches 368 Tags
bb66e5462682b8e9c5a334476db3dc44632c9723
Commit Graph

1748 Commits

Author SHA1 Message Date
Eike Ziller
71d9f33bef Merge remote-tracking branch 'origin/2.5' 2012-04-26 07:06:04 +02:00
Robert Loehning
c15b727345 Squish: Added workaround for Qt 4.8.1 
Change-Id: I6f0c3a1549e127dad9dc7278c72dcfc782f86309
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-04-25 14:28:42 +02:00
hjk
feba990f6e preprocessor: swallow ) after defined(... 
Task-number: QTCREATORBUG-7256
Change-Id: I6149e56e5f50f75c9e039be9c162036a3890e2d7
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-25 13:41:51 +02:00
hjk
fab38eb621 debugger: add some webkit access to manual test 
Change-Id: Ibb20d683b4e3052d74721cbe7d6b2e6bd4a6daa2
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-25 12:32:20 +02:00
hjk
7f1f282111 preprocessor: some code style in auto test 
Change-Id: I1381ce17098a87dbc3924dc86902d7cc1b1eec76
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-25 09:30:34 +02:00
hjk
837cbd01e6 make manual process test compile with namespaces 
Change-Id: I18427130c15f502eb1cec4c383f8bb5b14dcd6c7
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-24 17:13:48 +02:00
hjk
c5acc63275 debugger: autotest compile fix 
Change-Id: Ib2c0284c559c2060d21193a2b0f4fb63ed036acc
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-04-24 16:44:04 +02:00
Jan Kerekes
98c926f7e5 Added new test cases/suite for QML support 
initial commit

Change-Id: Ifff6a8f9f6b74e099a906fafeb7db2c74aa3bc6f
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-04-24 15:36:17 +02:00
Bill King
8182939315 Get tests compiling again on windows. 
Change-Id: I8590aae7b12dbf38156c60e04e3b45a5a9552f48
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-24 13:51:37 +02:00
Erik Verbruggen
bd47622183 Fix out-of-memory crash when indenting generated tokens. 
Generated tokens do not have a position in any source file, so not try
to indent them. Previously, the 'source' used was the scratch buffer,
which would not contain newlines, so the indent depth would be the
length of the scratch buffer at that point.

Task-number: QTCREATORBUG-7262
Change-Id: If94213d6dffd13dd2b47c7038ec2398ad925d904
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-04-23 11:06:35 +02:00
hjk
6d393252c4 preprocessor: rename operator() into run. 
Easier to follow.

Change-Id: I6da1ca862ddb7048a6d16bf5e6ea18d6b2cfc7f8
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-19 19:37:14 +02:00
hjk
538901d441 preprocessor: make Preprocessor::preprocess private 
Change-Id: Ic81e3ebec1b42ae0698a340ee7e1c711225c1162
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-19 18:47:03 +02:00
hjk
acf6f8f0cb preprocessor: make Environment::{resolve,remove} work on ByteArrayRefs only 
Change-Id: Idb93d359bd45696a38cb863dcea30c5c377eeabb
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-19 18:41:18 +02:00
hjk
3428240233 preprocessor: add autotest for defined(...) and undefined(...) 
Change-Id: I7c843a449bb6db348ab374b4bd2c378b797b94cd
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-19 18:38:00 +02:00
Oswald Buddenhagen
822233629d Merge remote-tracking branch 'origin/2.5' 
Conflicts:
	qtcreator.pri
	src/libs/utils/utils.qbs
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmljseditor/qmljseditor.qbs
	src/plugins/qmljsinspector/qmljsinspector.qbs

Change-Id: Ib239d50c21cb06d3a8e821e03dc093552f40ffab
 2012-04-19 16:13:09 +02:00
hjk
a7a3941cc2 debugger: Fix QString, QVector, QByteArray dumper for Qt 5 container changes. 
Change-Id: Ib966adda453cbc8e44c36ae629f62ac3a5bf5bf7
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-04-18 15:56:55 +02:00
hjk
c937161c5e debugger: remove accidental enabling of endless loop test in manual test 
This reverts part of b439999.

Change-Id: I7d9696188a4f1a59b64817b08edd70047633c461
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-17 16:14:23 +02:00
hjk
b439999f1d debugger: try quicker start when no breakpoints are set 
This prevents initial reading of debug information when no
breakpoints are set. The debug information will be read on
first stop instead, e.g. when the user interrupts.

Change-Id: I6156347bf108e9ed89f54ca67021f37c02fa5116
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2012-04-17 12:35:24 +02:00
hjk
b79f13df6a fakevim: make sure pending input is only processed once 
Change-Id: I0c6141eff49413f66cfee9a1f117279cdfcd4f36
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-17 11:20:37 +02:00
hjk
37e3853090 preprocessor tests: compile fix 
Change-Id: Iab9fb8ecbad94e08d39b6fad60caaf98a85d5980
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-17 09:40:34 +02:00
Christian Stenger
13b8e587a6 Squish: New helper functions for debug test 
Change-Id: I606bc1c98d807548a481a69f8bdc25577a0e54d8
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-17 09:22:22 +02:00
Oswald Buddenhagen
6b8167c663 Merge remote-tracking branch 'origin/2.5' 2012-04-16 10:03:48 +02:00
Daniel Teske
53553165ba Debugger simple test: Clarify description of multiple breakpoints 
Change-Id: I470d326bd872f2904893c8b7eb17a0a9c88f1e0e
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-15 20:36:10 +02:00
Daniel Teske
9589e8dd7c Debugger simple test case: Move BREAK_HERE 
The manual tests can't be followed otherwise

Change-Id: I09f0b99a63bd5189dcd0dc74c53e310d78f0b083
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-15 20:34:06 +02:00
Daniel Teske
766d19aba9 Fix Debugger simple test testStdVector4 
Change-Id: I5ce7cb163bcb70171f6c6e7ae2b06b4522dd7a13
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-15 20:31:49 +02:00
Daniel Teske
aa1d7b25e1 Debugger simple test case testQDateTime 
Make the changes in the L&W more apparent and also add a comment to step

Change-Id: I17fca560558fc266f8030c52f87fc81661f9fd02
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-13 14:57:27 +02:00
Daniel Teske
49ab5e51fd Fix debugger simple test case test13393 
Change-Id: I51e1576febed91e9c8c4c264f76094c152627032
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-13 14:56:26 +02:00
Jan Kerekes
9d263a1b34 Added new test cases/suite for c support 
initial commit

Change-Id: I8eb36efa0e7e577597708d97a2efe52c07801f02
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-13 11:10:58 +02:00
Robert Loehning
5f1e7642ed debugger: Removed redundant checks in self-test 
Change-Id: Iee8cfe736ff84eb9bcf82b1f1cda01eec38f19c2
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-12 14:03:10 +02:00
Joerg Bornemann
96a7fbe3ae qbs files: use Qt5 module dependencies 
Renamed gui -> widgets.
Renamed declarative -> quick1.

With qbs the usage of qt.widgets and qt.quick1 with Qt4 is supported.

Change-Id: I6cadaf34527f1f880d74ced7d2d18dd9801b7de1
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-04-10 18:02:39 +02:00
Christian Stenger
146b1672d2 Squish: Handle None in __cropAndLog__() 
Change-Id: Ie2bbcfde7684f0d25ed8ff7e7da2897a9f1a0873
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-10 14:58:18 +02:00
Christian Stenger
88eec5ae47 Squish: Use sorted filenames also for Console 
Change-Id: I8ac973e772b3d1856e5307319c75fb4d150cf818
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-10 13:54:43 +02:00
Christian Stenger
c4e5dcb770 Squish: Change temporarily(?) to Console 
Change-Id: Ib31780a5cc4a159afb4f3eeef4165d30f09e2ba7
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-05 20:13:00 +02:00
Christian Stenger
fb85d0a0f2 Squish: Handle Update Generated Files on Mac 
Change-Id: I390ba57266ab983335a5d76d38a025b4306c5b74
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-05 20:05:54 +02:00
Christian Stenger
158dfffe7d Squish: Add try/except to continue anyway 
Change-Id: I24a51142988841da3aa156f6a5e6e239a6bd1914
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-05 19:51:59 +02:00
Eike Ziller
9ec6e9f7e0 Merge remote-tracking branch 'origin/2.5' 2012-04-05 18:24:26 +02:00
Robert Loehning
f521c9f062 Squish: Always use the same function for preparing templates 
Change-Id: I90dac33dde4c0c3d39c8e8038371dfbb3403dce3
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-04-05 17:22:06 +02:00
Eike Ziller
c814538d95 Merge remote-tracking branch 'origin/2.5' 2012-04-04 16:20:10 +02:00
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