feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
84,931 Commits 108 Branches 368 Tags
ed52d0772786cd901b0803a1186feec69b1ecda4
Commit Graph

7732 Commits

Author SHA1 Message Date
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
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