feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,929 Commits 108 Branches 368 Tags
3b901b25a86f49ebef9be03ec762ed76422fd91c
Commit Graph

4400 Commits

Author SHA1 Message Date
Christian Kamm
69d6a508d3 QmlJS indenter: Fix braceless switch/try/with bindings. 
Change-Id: Iee25f3f9ec38b1b7fc2697f390386c9a60cb8347
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-12-02 09:15:04 +01:00
hjk
844437c666 debugger: use the same type formats for arrays of same base type 
Task-number: QTCREATORBUG-5582
Change-Id: I690c755fc5d2ea127ea12f65f799accb10ff20c9
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-30 16:04:24 +01:00
hjk
600a2f839e debugger: make use of dynamic type for dumpers configurable 
It's too expensive to have it unconditionally on in some settings.
Giving the user the possibility to switch it off seems ok.

Change-Id: I7bdcb0ce919f0dca83a4563ac83958efdeb251e7
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-30 11:50:20 +01:00
Christian Kamm
a24c49720a QmlJS reformatter: Fix object literals. 
The comma token seems to be invalid.

Change-Id: I859fa58ba0ba1e975e0cf1105c2b53aac848fb0d
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2011-11-30 10:11:28 +01:00
Robert Loehning
844b1c0490 Squish: Improved timeouts 
- tuned timeouts according to expected duration
- use default timeout instead of passing equal value

Change-Id: I90bcbc5ecfd420a01e05acabc987a67b322c1f3f
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-29 14:34:21 +01:00
hjk
bca96ff17e debugger: squash msvc warning about structs and classes 
Change-Id: I5de2f086e7b2ff6faaae4995c4fc1949e93281e1
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-11-29 14:17:06 +01:00
Christian Kandeler
57c0979012 SSH: Support different read channels in SshRemoteProcess. 
This is part of the effort to support more QProcess concepts.

Change-Id: Idb888e733570a58d3810f371409b657b30bbd929
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-29 14:00:39 +01:00
hjk
59359905bf debugger: add manual test for dumping derived classes using base pointer 
Change-Id: I65c5977fc16083cf09a123c6beadbc156a9f29c7
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-11-29 13:43:59 +01:00
Christian Kamm
d02b647bbf QmlJS checks: Don't warn for fallthrough on the last clause. 
Change-Id: Ica84ced241eafd82cededa65d2e90f855e448f89
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-11-29 11:11:41 +01:00
Christian Kamm
a920096c97 QmlJS checks: Accept 'fallthrough' comment to terminate case blocks. 
Change-Id: Icf71416e8aa892089b0918529b94f4cd6a1db5a3
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2011-11-29 08:25:51 +01:00
Christian Stenger
b042661686 Squish: Fix this test for Creator master branch 
Change-Id: I3f8a9238af15ec15a94f458ce55cb77a47b248f9
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-11-28 14:06:22 +01:00
Eike Ziller
b50e48a1fa Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	share/qtcreator/welcomescreen/widgets/ExampleDelegate.qml
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/exampleslistmodel.h
	src/plugins/qtsupport/gettingstartedwelcomepage.cpp
	src/plugins/qtsupport/gettingstartedwelcomepage.h

Change-Id: I268072db01064d71bc4828942d71fc772ddd3539
 2011-11-28 08:34:37 +01:00
Christian Stenger
8500fa9f6a Squish: Improve hook-into sub-processes 
With this patch it's possible to not only hook into the
QmlApplicationViewer (although nothing else is currently done)
and additionally to not only send the closing event to the
sub-process. You can now define a function that will be executed
on the sub-process.
Both modified tests show an example how to use it.

Change-Id: I39b9959f2cf1d519b8afeb0c479ac2d68ea20ca6
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-11-25 19:39:41 +01:00
hjk
3e03c06420 debugger: start automization of manual tests 
Change-Id: I33bd046eca253130049d0a80de7a1a3f3e442307
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-25 16:30:38 +01:00
Robert Loehning
0a48570f6a Squish: Update for changed sorting of project wizards 
Change-Id: Ia1a5cbe1ace8e4bed0500e7c46fcff90a10cc7ae
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-25 16:01:06 +01:00
Robert Loehning
fe4c9053d8 Squish: Update for label renamed in master 
Change-Id: I8ad167cca8c878efd67eca9ac48b4df237d31726
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-25 16:00:22 +01:00
Robert Loehning
f924f1ef69 debugger: I guess running the functions once is enough 
Change-Id: I98953503fcb7b79b76927c50f39b82f2ceb6508d
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-25 12:06:01 +01:00
Eike Ziller
e2b0835b58 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	src/plugins/analyzerbase/startremotedialog.ui
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qt4projectmanager/makestep.cpp

Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1
 2011-11-25 09:48:25 +01:00
Robert Loehning
f107ec5ba6 Squish: Made functions verifyEnabled and selectFromCombo more generic 
Change-Id: I1f0d48712f5ec081fa323e929dabaeee1dbf9b63
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-24 17:52:26 +01:00
Friedemann Kleint
649ba48e4a Compile with Qt 5/Linux. 
(after running fixqt4headers.pl).

Change-Id: Icb047cee2bd69acdb049beb9a769bfd2f4dcb841
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-11-24 12:05:03 +01:00
Friedemann Kleint
b0eff051c1 Add Qt 5 libraries to .pro files. 
Make Qt Creator compile with Qt 5 after using fixqt4headers.pl.

Change-Id: I74ca51d562f49378b40103b79848f5dd3b11e77e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-24 12:02:30 +01:00
Robert Loehning
88fd98fbc4 debugger: Minor fixes in simple.pro 
Change-Id: I30df2e35b306085d0c7ac5ad6be1f7dfe694abe0
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-24 10:49:26 +01:00
Robert Loehning
6a1bb10cbe Squish: Added default mappings for Linux 64 
Change-Id: I3b6b6fc0b5c6520e767a7c923be9bd3f3b3b6517
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-23 16:54:24 +01:00
Christian Stenger
3089bd3f6c Squish: Implements hooking into the subprocess 
Change-Id: Ic1ae2a8341d01e179f9d52b7c7ad3cbe24995bd1
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-11-23 15:49:04 +01:00
hjk
fa66a540fd fix C++11 string literal incompatibility 
Change-Id: Ie5d484ba7078f29eae6636d01e1d99e3e45d1a45
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-22 15:51:41 +01:00
Christian Kamm
fad5cc0166 QmlJS indenter: Fix hang when using 'else (a==a) {}'. 
Change-Id: Id7b8fba6707b1eaabf8065854f357cf600c809c5
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
(cherry picked from commit 567e68a42a)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-22 13:52:39 +01:00
Christian Kamm
eaf4b5be53 QmlJS check: Extend "don't use var" performance warning. 
* now also recognizes color, rect, point, size, vector3d
* to do detect these correctly, set the return types on a number of
  builtin Qt.* functions
* add test

Change-Id: Ieaeb73be208af2d47e1bb4fa1485dc876705ee20
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2011-11-22 13:25:14 +01:00
Christian Kandeler
abd98ebeaa Tests: Replace SSH scripting crutch with proper rpath solution. 
Change-Id: Ieae3099d5fe2f69415a86a0e2155d30b699fa3c4
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-11-21 11:10:15 +01:00
hjk
eb8447d7c4 debugger: convert remaining manual tests to "new style" 
Change-Id: Ibc91274feab42077ee55514b8461d504020b7852
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-18 15:05:09 +01:00
Eike Ziller
fbd47e25ee Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	share/qtcreator/templates/qtquickapp/main.cpp
	src/plugins/analyzerbase/analyzermanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4
 2011-11-18 10:16:49 +01:00
Christian Stenger
54d5059ec0 Squish: Small fix and improvement for indent test 
Change-Id: Ib34050986433bf9010da2e8cf71fe6651559c015
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-11-17 08:44:39 +01:00
hjk
a5cb3af274 debugger: improve qstack manual tests 
Change-Id: I74d06fa0390e88e57c4b6c54b6afcf30dd3e61f9
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-16 16:47:36 +01:00
hjk
f8baa4f342 debugger: improve qset dumper manual test 
Change-Id: I3868991f22f2dc56b6bd0464f11e7ce7f26efc7a
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-16 16:38:08 +01:00
Robert Loehning
23bbcb5e81 debugger: Compile fix for MSVC in manual test 
Avoiding error C2177: constant too big

Change-Id: I61043cf2c6fb71e45dd25d5387711653949fd0b0
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-16 16:19:01 +01:00
Christian Kandeler
4c76e40617 SSH: Derive SshRemoteProcess from QIODevice. 
Now it looks even more like QProcess. Things like process channels are
still missing.

Change-Id: I3f30cd00ed4a054d02e83add9a6f4162b48f8345
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-11-15 17:32:55 +01:00
hjk
739593c590 debugger: add manual test for display of big integers 
Change-Id: I8b6f7f9f446a6dddc31993a463a31f0eb6a4f827
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-15 16:58:53 +01:00
Christian Kamm
92b8a2eba8 QmlJS tests: Move 'basic' codemodel test to QmlJSTools plugin. 
Change-Id: I2310f914fb200db18ff4148d6f7fa9824fe2393e
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-11-15 16:11:30 +01:00
Christian Kamm
bc1b724476 C++: Move codegen test into the CppTools plugin. 
Change-Id: I4c70a9dbd5445188c3d202427da96e1c6ff90b63
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-11-15 15:37:29 +01:00
Christian Kamm
a5b26a32b3 QmlJS: Add 'reformat' action which regenerates the whole file. 
Change-Id: I0aed6c6e197e122200d720eb9291a083095a6299
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-11-15 11:31:40 +01:00
Christian Kamm
12a1ba08fa QmlJS indenter: Fix indent after do-while without semicolon. 
Change-Id: I4909f4640e7cd115b6c5c54c7aca7fca511653c9
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2011-11-15 08:58:21 +01:00
Robert Loehning
fde3e900a8 Squish: Updated Creator's settings to new Qt SDK 1.1.4 
Change-Id: Ic77c7ba0ca101ff0745b8dc89f7a04824c9c7ea1
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-14 17:54:43 +01:00
Christian Kandeler
232724cc11 SSH: Make API of SshRemoteProcess more similar to the one of QProcess. 
In the end, we want to derive it from QIODevice as well.

Change-Id: I30e7cb23ec8e5753c363d1f4457b650556860ac2
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-11-14 17:42:27 +01:00
Christian Kandeler
75a7bf2919 SSH: Add convencience script for tests. 
rpath experiments failed, so let's just do it like that.

Change-Id: I029580f54145592bc858d564fb198bc25949e330
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-11-14 17:29:44 +01:00
Christian Kandeler
25e716ed77 SSH: Adapt tests to API changes. 
Change-Id: If4d2c7cc088f4dee13186a0e98b8d8e6385e500f
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-11-14 17:27:58 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
Christian Kamm
412e61d2c2 QmlJS: Fix tests. 
* Some were not adjusted for the Document::MutablePtr change.
* The basic test failed because the welcome plugin failed to load.
* The check test wasn't updated for @disable -> @disable-check.

Change-Id: Iae848832f740363bc33915d7a202a6cff08e2189
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-11-09 15:54:43 +01:00
hjk
371ae894f0 debugger: fix display of signal-slot connection 
Change-Id: I0923bdd0ba1166639d85f8343a5abce8f2912400
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-09 08:49:08 +01:00
Robert Loehning
04dfc44970 Squish: No Symbian target on unix-like systems 
The SDK does not provide Qt for Symbian on Linux and Mac so there's no
need to wait for such a target.

Change-Id: I6c48f21317a29f2bfdf7b1fa9d87890a7f74a4eb
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-08 23:55:52 +01:00
hjk
cc2433f79e debugger: fix display of signal-slot connection 
Change-Id: I0923bdd0ba1166639d85f8343a5abce8f2912400
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-08 15:20:51 +01:00
Robert Loehning
e465a1763b Squish: Added function ensureChecked 
Change-Id: Icca18645613d0b88e4394aa5fc3820626a59e647
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-08 14:12:40 +01:00