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
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
Christian Kandeler
a9cd250452 SSH: Fix tests. 
- Add/fix include guards.
- Add QtNetwork dependency.

Change-Id: Ia9ebf9d48117e4b45325a365d52873034404d4c8
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2012-02-27 11:01:40 +01:00
Robert Loehning
873b0805a0 Squish: Raising timeout 
Hoping to stabilize this on Mac.

Change-Id: Iaac5891076166130071ce5ca59a5a89402e6017a
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-02-23 18:41:00 +01:00
hjk
e3087ff7a9 debugger: add manual test for std::unique_ptr dumper 
Change-Id: I700abc4ff629992aa7cc821b9a575685fd1e8005
Reviewed-by: hjk <qthjk@ovi.com>
 2012-02-23 18:05:34 +01:00
hjk
e19601d8a3 debugger: suppress compiler warning in manual test 
Change-Id: I28005f36e3ebaf3f83fb3ba230b74babfeaea85d
Reviewed-by: hjk <qthjk@ovi.com>
 2012-02-23 18:05:08 +01:00
Christian Stenger
e1970f1823 Squish: Add workaround for QTCREATORBUG-6994 
Change-Id: I8077f50a1359db9044a0b0c607e3cc94e7f1f042
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-23 16:42:05 +01:00
Christian Stenger
a6f9035396 Squish: Clean up (Bug 6967 is closed) 
Task-number: QTCREATORBUG-6967

Change-Id: I460110bbad5a400aef474f837fe29c2821594fd5
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-23 14:15:18 +01:00
Christian Stenger
ecb8ff1a0e Squish: Avoid fails on timing issues 
Change-Id: Icd6f426ca06364a6a878d0f63618a3852d6eec46
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-23 14:05:43 +01:00
Christian Stenger
b809e805aa Squish: Fix trailing whitespace 
Additionally pushing Cancel instead of OK when
leaving Options dialog (we don't change anything).

Change-Id: I67ff5a891dc3a038822ff42e798981f00d633e80
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-23 14:01:22 +01:00
Christian Stenger
696dd9a70d Squish: Added small debugging output 
Change-Id: Ia31afc253bad05c3143c8704c95b41cc949e13f2
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-23 11:44:35 +01:00
Erik Verbruggen
368d5926ca C++: handle destructor names with template parameters. 
Change-Id: I74b4fd5e043db935abc18345b303d294b71e8fc2
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2012-02-23 08:39:34 +01:00
Christian Stenger
c9999a9382 Squish: Fix for running inside Jenkins 
Change-Id: I443864e41e227e2d5638f668de272c6c7b9a5229
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-22 21:01:16 +01:00
hjk
7b471270f0 debugger: add manual test for QTCREATORBUG-6933 
Task-number: QTCREATORBUG-6933
Change-Id: Iaa4df837b54b57363f40eb81b87f7021d0793cea
Reviewed-by: hjk <qthjk@ovi.com>
 2012-02-22 18:37:14 +01:00
Robert Loehning
0e0158fc3f Squish: Cleaned for-loops 
Change-Id: Ide5313c8838aa7ad9ad74cbaed12872ce0a35413
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-02-22 16:58:01 +01:00
Christian Stenger
3ad7e50827 Squish: Verify targets for project creation 
Change-Id: I3af0e0cde985c4b04bd4ae8181c3b82cda22b2b8
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-22 13:57:47 +01:00
Christian Stenger
5485d15982 Squish: Reverted unsuccessful try, raised timeout 
Change-Id: I1ce57c671eab1ff2084724b7799867326cd7ed24
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-21 14:50:07 +01:00
Robert Loehning
d3ad49ea4d Squish: Excluding Maemo target from Qt Quick projects 
Change-Id: Ief66b17723d867711bd9eb4a9fa549e930efd7f9
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-21 13:58:25 +01:00
Christian Stenger
4667371b9a Squish: Add timeout for cli test 
Change-Id: Id7a8a01d48cd78e98edad9885ecb41360e62e649
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-21 12:46:50 +01:00
Christian Stenger
a1c504e8cf Squish: Try to make 64bit pass on Jenkins 
Change-Id: Id829958f434ed96569ac3278271a2d2caf78d674
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-21 12:20:09 +01:00
Christian Stenger
7f44b1e588 Squish: Added timeout 
Maybe this fix an issue when running the tst_qml_editor
inside jenkins.

Change-Id: I3cec1bf452e1c3cab7cb0aca6854105c774248a8
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-20 10:50:51 +01:00