feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
27,509 Commits 108 Branches 368 Tags
76bf971cb9545793d56bc7805622a4d5d4871711
Commit Graph

2079 Commits

Author SHA1 Message Date
Eike Ziller
fe74a9a722 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/cxx11/cxx11.pro
	tests/auto/cplusplus/cxx11/tst_cxx11.cpp
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I3c8351ad35617f56d15b788c8a46d8a6f453ef70
 2012-11-09 11:20:10 +01:00
Thomas Hartmann
5debabc410 QmlJS: adding SimpleReader 
SimpleReader is a !simple! parser for json like qml files.
SimpleReader only parses literal properties for e.g. configuration
files.

SimpleAbstractStreamReader allows event based parsing and SimpleReader
stores the parsed data in a reference counted tree structure.

Change-Id: I0f6422a97f5c356149c516f227f8bbd7b736a6d0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2012-11-07 16:42:28 +01:00
Robert Loehning
122585dc5a debugger: make USE_AUTOBREAK work with MSVC 
Done-with: Joerg Bornemann <joerg.bornemann@digia.com>

Task-number: QTCREATORBUG-6495
Change-Id: Ic58430c14959985e824eb977d72874569b9fb617
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-07 16:24:54 +01:00
Nikolai Kosjar
492ca1cbcf Tests: C++: Make tests run from shadow builds. 
For shadow builds some tests couldn't find their test data. Solved by
using the same pattern as in Qt tests: Inject $$PWD as SRCDIR via a
DEFINES statement.

Note: It was considered to use QFINDTESTDATA for Qt5, but this was
rejected due to:
 1) It's Qt5 only (would mean to introduce some wrapper...)
 2) As the doc states, it will not work with QTEST_APPLESS_MAIN tests.

Change-Id: Ie6cf59570fe61725b7f6f83b7da650331ddb38fc
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2012-11-07 14:10:24 +01:00
Nikolai Kosjar
9f38f7bfbc C++: Store lambda captures in the code model. 
Done-with: Erik Verbruggen
Task-number: QTCREATORBUG-7968
Task-number: QTCREATORBUG-7949

Change-Id: I0cf727052d0a3536ed96ee894b18768c9538c213
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2012-11-07 13:36:20 +01:00
Robert Loehning
77313fd980 Squish: Removed pointless explicit timeouts 
Change-Id: I21e41fc8d1c26186afe0d18613c764abd065227e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-11-05 12:59:07 +01:00
Nikolai Kosjar
fb61be5ed6 Qt5: Correct usage of testlib. 
This corrects commit 112f80. $$QTESTLIB is not needed since both Qt4 and
Qt5 support "QT += testlib".

Change-Id: I776b44825295c86d2d85e9b8dc6a422da6f36ab6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-11-05 12:58:53 +01:00
Robert Loehning
88d52c1d59 Squish: Added test case for deleting files outside of editor 
Change-Id: Ib9724e0794dab7e4b2de39e72d671c8bf8f27b08
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-11-05 12:57:38 +01:00
Christian Stenger
39b3c0a1e8 Squish: Test for reverting unsaved changes 
Change-Id: I54398b5b576b9b715e473861e287546afdb4f32a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-11-01 17:09:58 +01:00
Christian Stenger
47289addff Squish: Test handling of read only files 
Change-Id: I459fdaed7338f5343b760da47e9652baf78986f0
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-11-01 17:09:40 +01:00
Christian Stenger
270207f77e Squish: Update README file 
Change-Id: I12761ec48af3a05d83dcaffe66b7e413d2fd4937
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-11-01 13:40:19 +01:00
Robert Loehning
90058c2a85 Squish: Update in CSUP02 
Change-Id: I50cd4cf4ac794686db436274376ef13197631041
Reviewed-by: David Schulz <david.schulz@digia.com>
 2012-11-01 07:35:17 +01:00
hjk
bebc351c35 debugger: add manual test for rvalue references 
Currently shown as normal references, but that's according to
what gdb reports.

Change-Id: I7d56429b8cca128accb8a638992ea7e4e8241305
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-31 15:02:16 +01:00
Robert Loehning
b565197145 Squish: Updated function pickVersion474runVerify() 
Change-Id: I02733645a6367429ce97007cfa4b882534786d78
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-30 09:54:50 +01:00
Robert Loehning
e60d2af0b1 Squish: Updated iterateBuildConfigs() to handle multiple kits 
Change-Id: I724e45bf510015dbdae6cb4c6cb55285167dafbc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-30 09:54:22 +01:00
Robert Loehning
20d4efb0b1 Squish: Removed unused functions 
Change-Id: Idf66788a8f693d836fafe26f3355a96395066c37
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-29 18:28:01 +01:00
Eike Ziller
67b0637934 Merge remote-tracking branch 'origin/2.6' 2012-10-29 15:13:06 +01:00
Robert Loehning
1f9e226e77 Squish: Closing file after reading 
Change-Id: I69f53c7626bbdb14874d0e5d459fa0ac346d40a0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-29 11:03:21 +01:00
hjk
fc31836ebd debugger: compile fix in manual tests 
Change-Id: Ifeea11c5430e3d4d55273472fdbc2a732ea08d46
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-26 11:02:07 +02:00
hjk
bddec831d8 debugger: add manual test to start processes 
Change-Id: Ia24fa547d1121f819f27248c67b4fbee0ff7512e
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-26 09:06:52 +02:00
Robert Loehning
95af1cd4f8 Squish: Added helper functions for views and models 
Change-Id: Ic5dc4a5fe11ec5f693ef9f5ddf3abbefd689fd99
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-25 13:58:34 +02:00
Eike Ziller
0a1bdf4257 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/share.qbs
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6
 2012-10-25 10:45:58 +02:00
Nikolai Kosjar
112f80c6c6 Qt5: Fix warning "qtestlib is deprecated". 
"Project WARNING: CONFIG+=qtestlib is deprecated. Use QT+=testlib
instead."

Change-Id: Ia6dcce078736cac0f0b05e0f621a25f97c9dac87
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-24 13:51:16 +02:00
Robert Loehning
d4c8f23999 Squish: Added tool to convert objects.map into tsv 
Change-Id: Icd86b82d55f0c994c80be04fc0006d577d11d2de
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-23 17:04:46 +02:00
Alessandro Portale
6b7501a1e2 Appwizard test: Fix compilation and warnings 
Change-Id: I6ec16d21c2c8554637361a48deddc71ebb52e7ce
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-23 16:12:34 +02:00
Nikolai Kosjar
6481deb8c8 C++: Fix crashes in tests with Qt5. 
tst_Semantic and tst_CodeFormatter crash with QTEST_APPLESS_MAIN since
they need to access some font settings via QTextDocument /
Q*Application. Use QTEST_MAIN instead.

Change-Id: Id85228acb6006cfaee41c634c6a32b6c23a70105
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2012-10-23 14:07:35 +02:00
Nikolai Kosjar
5d730be06e C++: Compile fixes in tests and tools. 
After some refactorings not all usages, especially in tests and tools,
were adapted.

Change-Id: I7ed24bb1c8e55e55ed74eda3a8fd7610e725f4cb
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-23 12:26:47 +02:00
Christian Stenger
86e544ce4c Squish: Fix typeLines() 
Change-Id: I13abcceebc3f61b508da658d5e9d4650fddff6ea
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-10-23 09:16:06 +02:00
Eike Ziller
021b64b5df Merge remote-tracking branch 'origin/2.6' 2012-10-22 11:17:09 +02:00
hjk
6d785dd7d7 debugger: fix warning in manual test on mac 
Change-Id: I73809b42bb13bd38d9a30286334621b3b6e654dd
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-19 16:36:07 +02:00
Robert Loehning
fa655dd407 Squish: Moved editor tests to editors suite 
Change-Id: I82bd92db762f7f997460ece4c2f77d0381dca6b5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-19 14:21:24 +02:00
Robert Loehning
b262d50f13 Squish: Raised snooze in waitForCleanShutdown() 
Change-Id: Iae110755f979a78c5cb3e4199cfc851f1feccb0c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-19 13:32:39 +02:00
Christian Stenger
a1a3da9d2d Squish: Add test for renaming macros 
Change-Id: I9c9bc9556234ec321c6e3723f5276a0b66f6c90a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-10-19 13:29:55 +02:00
Robert Loehning
0299d54d2d Squish: Cleaned path maintenance in tst_build_speedcrunch 
Change-Id: Ic3cb8571c79ab2880975a439d893ba794c153d7e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-18 19:32:17 +02:00
Robert Loehning
9ac92a938b Squish: Fixed validateSearchResult() 
Fixes fails in tst_CSUP04 introduced by 6b5bccd08e

Change-Id: I7ad33b745e7a55b078952ca88c9ee5123ffc639b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-18 17:22:42 +02:00
Robert Loehning
3e88f62f33 Squish: Hack for fixing waitForCleanShutdown() 
Change-Id: I925a59fdd96f161a324375ebee4b4588dfd035fb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-18 16:28:47 +02:00
Robert Loehning
6c1067c2ec Squish: Copying project to tempDir in tst_basic_cpp_support 
Change-Id: I1788ff642486204beb22bf0a02400c50fbb7f3bf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-18 16:26:51 +02:00
Robert Loehning
9687e18820 Squish: Removed outdated cleanups 
__removeTmpSettingsDir__() does it all.

Change-Id: Ic1eb2ef02665c5d863956a1587f4f46344743f8e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-18 16:26:28 +02:00
Eike Ziller
49d5c2381a Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/3rdparty/botan/botan.qbs
	src/libs/ssh/ssh.qbs
	src/plugins/qnx/blackberryqtversion.cpp

Change-Id: Ie8d16d636528aab4006310eab47a342fdf2634d9
 2012-10-18 10:40:11 +02:00
Robert Loehning
f15745ab42 debugger: Fixed automatic run of self test 
Change-Id: Icf2c100db571a37bc9e20e0e9cab47a627cfec23
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-17 20:31:27 +02:00
Robert Loehning
b010720483 Squish: Removed workaround 
Bug is fixed in Qt 4.8.3

Task-number: QTCREATORBUG-7215
Change-Id: Idccfa11bf23ef4ed1962a8f84cf039b3de2bb8ea
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-17 16:24:13 +02:00
hjk
9f1d8b66e3 debugger: fix display of gcc's built-in vector types 
Change-Id: I293be4f5c207828c64de30236a25f6c0062346b8
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-17 15:25:04 +02:00
Eike Ziller
70b5e1f64d Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d
 2012-10-16 17:42:10 +02:00
Robert Loehning
a630a26810 Squish: Updated tst_WELP01 
Change-Id: Ie4440b404e306b7eb89ad9d344a8d0fb3b7294ae
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-12 13:09:15 +02:00
Eike Ziller
720cb9f35e Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/ssh/sshconnection.cpp

Change-Id: I2946cbec1b5159eef9e47949860b28fba1e51529
 2012-10-11 21:11:40 +02:00
Christian Stenger
27dd24ce7f Squish: Provide tool for objects.map 
This is just a simple helper that works for the current
approach (a single objects.map within the root of Squish
tests).

Change-Id: I27bbc6d100f5196ada0e8c7a9ffe281a53fa0abd
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-10-11 09:47:59 +02:00
Erik Verbruggen
e72be772c5 C++: added some notes regarding QTCREATORBUG-7968 
Change-Id: Ia7a0e4b416ba6ef768d76595d8576262a828ae78
Reviewed-by: David Schulz <david.schulz@digia.com>
 2012-10-11 08:53:51 +02:00
Robert Loehning
6bd79c979e debugger: Fixed issues in self test 
Change-Id: I06802b87f861307de3c8d2b617455afdce0127a4
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-10 19:36:56 +02:00
Christian Stenger
93ff2db370 Squish: Enhance function to create new project 
This is a preparation for an upcoming patch.

Change-Id: Ia3ed2ca8a68aa3ccb8ecf304e40abd8055afd5c0
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-10-10 11:53:30 +02:00
Eike Ziller
e6623754e8 One more Nokia replacement. 
Change-Id: Ic0a3718d0f1f12e8894c532d5cc034574e26ebeb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-09 15:49:48 +02:00