feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
22,648 Commits 108 Branches 368 Tags
d2f8baad67bb18d70f42ed2bc62ced778a46ff20
Commit Graph

1466 Commits

Author SHA1 Message Date
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
hjk
332ea08142 debugger: Use Latin1 as default for char *. 
Change-Id: I5a5f76d312f97c6684542fd3e31f68f78d6acf58
Task-Number: QTCREATORBUG-5232
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-08 11:56:15 +01:00
Robert Loehning
c79d8b32b4 Squish: Some more reuse of code 
Change-Id: I3d4e7c0b9d8afc31fb5cfa2bc7879ea999129158
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-08 10:47:19 +01:00
Robert Loehning
c8b44dedfb debugger: Make simple.pro compile with MSVC and USE_AUTOBREAK == 1 
Change-Id: I1e25ede989a608d941e5f26f4470e397a895b3da
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-08 09:38:34 +01:00
hjk
60e392423f debugger: Use Latin1 as default for char *. 
Change-Id: I5a5f76d312f97c6684542fd3e31f68f78d6acf58
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-11-07 10:37:20 +01:00
hjk
45f6399939 debugger: workaround for http://sourceware.org/bugzilla/show_bug.cgi?id=13380 
Task-number: QTCREATORBUG-6465
Change-Id: I98894cbd247b53e18b86ec997b9087d1f2d511f3
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit dbc84d8c1c)
 2011-11-04 07:53:01 +01:00
hjk
dbc84d8c1c debugger: workaround for http://sourceware.org/bugzilla/show_bug.cgi?id=13380 
Task-number: QTCREATORBUG-6465
Change-Id: I98894cbd247b53e18b86ec997b9087d1f2d511f3
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-03 19:22:12 +01:00
Christian Stenger
8cac157529 Squish: Remove non-default Qt versions 
Change-Id: Ic56fb8f27b92872cac2e24721ecd74253ad25fdd
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-11-03 14:18:34 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
hjk
29279ab8c7 more style fixes of string literal access 
Change-Id: I60b0c53681c6a0cc38231e805479deb614aa0096
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-02 18:20:19 +01:00
Christian Stenger
3c350c93d8 Squish: Small refactoring - renamed helper 
Change-Id: I3ca9261043f568a9e160546998dd7b2cd5aa0dd4
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-11-02 09:41:53 +01:00
Robert Loehning
7a8ff987ec debugger: test should not crash by default 
Change-Id: Ied265e5077dfd13750465eab7828aa77fdf1c28d
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-02 08:25:04 +01:00
Eike Ziller
912cd548c0 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/madde/maemopackagecreationstep.cpp
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.h
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: I63ab2ba5dac006c37ccfbae55b023396a4676ff7
 2011-11-01 18:16:38 +01:00
Robert Loehning
8e508f3a5c Squish: Avoid blocking in tst_build_speedcrunch 
Change-Id: I468d57012df690c5e8120e1e5ec51ad7af224829
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-01 17:46:20 +01:00
Robert Loehning
edad3217e6 Squish: Added function which selects template for new project 
Change-Id: I7858e60c21641e39f6a5c23a12e3fd78a9d17334
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-01 14:48:55 +01:00
Christian Stenger
702b3f17ab Squish: Fix test for Linux/Mac 
Because of a different naming of the Qt versions on Linux/Mac
this test always runs without starting a build on these OS's.

Change-Id: I93d89576ee6f56d7de9aee70aa79ea58a4239c5f
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-11-01 13:57:35 +01:00
Robert Loehning
8cf0d1c608 Squish: Avoid timing issues when using Locator 
Change-Id: If768a758f3887607c9ef46939dc22685cf54fb45
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-01 13:56:22 +01:00
Robert Loehning
08115952ea Squish: Added function handling name and location of new projects 
Change-Id: I23af07bb41b517af1ad9f65c642c3eedd0712093
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-10-31 17:58:06 +01:00
hjk
30d6fb9865 debugger: disable some unconditional 'throw' in manual test 
Change-Id: I2d93a456234844a6e32f16ea30b9aa951946f508
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-31 16:19:28 +01:00
Christian Kamm
a9553c494e QmlJS indenter: Never touch indent of multi-line strings. 
Task-number: QTCREATORBUG-6368
Change-Id: Iae68427e429e625214bc0729aaaf313dc3371570
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-10-31 09:37:17 +01:00
Bill King
69e02f4fb8 Squish: Fix timing issue on linux (too fast to catch). 
Change-Id: Ia52abf2de8ef35269c11c198351e5024eae01830
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-10-28 15:24:10 +02:00
Eike Ziller
81cce8902e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljscheck.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
 2011-10-28 10:17:44 +02:00
hjk
e9620aa3b1 debugger: fix hard-coded location of declarative debug symbols 
This really should not be needed to start with.

Change-Id: Ife4349fe2d590c7a379d30b59a83bc9f54aeb063
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-27 10:56:28 +02:00
Bill King
f315598749 Fixes compilation when QT is namespaced. 
Change-Id: I5229e367d9468fcc25119c6efcb0f9127ac9a13d
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-26 11:21:47 +02:00
Christian Kamm
e906bbdb56 QmlJS checks: Warn about extra message suppressions. 
Reviewed-by: Fawzi Mohamed
Change-Id: I4038cd863ba80c1719417cd03b755b047f7d8b5e
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-21 08:31:45 +02:00
Bill King
9375810ef8 Tests: Make compile. 
Change-Id: I416c7cc20a07a4542e16e13519e784ee42fd73fd
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-20 16:43:37 +02:00
hjk
84cce9dc0e debugger: add testcase for valgrind 
Change-Id: I11caf760a2619fee88cfdc3568d533230b12a6c1
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-20 16:10:19 +02:00
hjk
103fc8325a debugger: add some test case for std::ifstream 
Change-Id: I296bdd70724d8ae4b70ea27de788b0bc0b2294cb
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-20 16:10:06 +02:00
hjk
2a27e47023 debugger: renamed gdbdebugger.pro to debugger.pro in manual tests 
Change-Id: Idbf1494f501221943eb322aeac9e2c429930a52b
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-20 16:09:18 +02:00
Christian Kamm
65ef5f7a35 Fix tests/auto/cplusplus/codegen on windows. 
Change-Id: I765baa58c6b39d98949c0c8530623baf112f42bb
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-10-20 11:44:15 +02:00
Christian Kamm
4565c12f2b QmlJS: Improve tests/tools/qml-ast2dot. 
Change-Id: Ifd06745ec823d09ae7b42318d418fa1adb01824b
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-20 11:04:03 +02:00
Christian Kamm
eebb138d45 Fix compilation of tests/tools/qml-ast2dot. 
Change-Id: I192c8f218371bd45c5bc2ae2cbb1b4464b7f0956
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-10-20 10:07:59 +02:00
Christian Kamm
567e68a42a QmlJS indenter: Fix hang when using 'else (a==a) {}'. 
Change-Id: Id7b8fba6707b1eaabf8065854f357cf600c809c5
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-10-19 09:40:12 +02:00
Christian Kamm
3ede0687ba QmlJS indenter: Improve indentation of function literals. 
Change-Id: Ic79745eefbf37e42d4dd42e73d3752bed34bbfa9
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-10-19 08:33:28 +02:00
Christian Kamm
4a487b1add QmlJS indenter: Move reusable code to qmljs lib. 
Change-Id: I5ab50b586109a9736cda48245807571ce10dfb5b
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-10-19 08:33:21 +02:00