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

1195 Commits

Author SHA1 Message Date
Robert Loehning
0877f4e254 Squish: Sorted test cases in suite_general 
Change-Id: I270606e8d9c89988102b5c2d37d345f33bd8da15
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-12-12 18:14:23 +01:00
Robert Loehning
9dd750c57a Squish: Update in tst_openqt_creator 
Change-Id: I4055cf6485bd89e756d7aba5f9e3df17d91eedd6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-12-12 16:50:58 +01:00
Robert Loehning
27421b1a81 Squish: Check installed languages 
Change-Id: I758381d67c431b4b7d6b7486f1d8561cf09c637b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-12-12 16:33:31 +01:00
Christian Stenger
352f6d6c4b Squish: Provide overrideStartApplication() 
Change-Id: I384d37f9c65b76c299220dea436e45ff58ba0333
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-12-12 14:51:21 +01:00
Robert Loehning
3f7413fd03 Squish: Added c++-file 
Can be used in tests/system/suite_editors/shared/testdata/files.tsv

Change-Id: Icafd42dfa8892b7314767b178d6ac8c3735d6200
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-12-05 10:54:47 +01:00
Eike Ziller
f43e6ca7ad Merge remote-tracking branch 'origin/2.6' 2012-12-05 10:39:22 +01:00
Christian Stenger
8a6d5ccd36 Squish: Fix usage of Qt Quick UI wizard 
Change-Id: I51aee75d695ab8faa8090dc44fd4abb79b0181b6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-12-05 09:30:33 +01:00
Christian Stenger
04e8abfa4c Squish: Fix tst_create_proj_wizard 
Change-Id: Id1609b5c4f46036e7a5fb90cd7fc720bd27c1844
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-12-05 09:30:23 +01:00
Christian Stenger
f47ca8f4d6 Squish: Fix tst_qtquick_creation4 
Change-Id: Iff7ce74c947dba7522b47991fb0217916dee921a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-12-04 14:54:32 +01:00
Robert Loehning
6f6ee546cd Squish: Added some to list of test files 
Task-number: QTCREATORBUG-8272

Change-Id: I248ee83c5f6b5db4189ac1b5458ba5f884a996a9
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-12-04 14:05:39 +01:00
Eike Ziller
d719eebfdc Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/coreplugin/editormanager/openeditorsview.cpp
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/debugger/qml/qmlinspectoradapter.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/exampleslistmodel.h
	src/plugins/welcome/welcomeplugin.cpp

Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39
 2012-11-30 17:02:35 +01:00
Christian Stenger
18e0363c71 Squish: Remove unnecessary calls to clean up 
Change-Id: I981392e5ef3397c3b80f1031e0644f84de1445f2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-11-28 21:11:05 +01:00
Robert Loehning
c6e7412626 Squish: Update for renamed wizard 
Change-Id: Ib8c5766171aa87c112286073ef82e776a0dc45e5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-11-28 13:45:54 +01:00
Christian Stenger
e53b4a9c76 Squish: Removed some Mac workarounds 
Change-Id: I85a4fee5acbb36096283daec982a8d31e42573b4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-11-27 15:29:53 +01:00
Christian Stenger
f049c58c5f Squish: Try to remove the strange snooze() call 
Change-Id: Ic2a475bf27167e8e3c3d3d1b5dcfb02cfbecaad3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-11-27 14:19:13 +01:00
Eike Ziller
387f5a7006 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/findusages/tst_findusages.cpp

Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63
 2012-11-26 10:52:28 +01:00
Robert Loehning
feae690513 Squish: Update for Target -> Kit renaming 
Change-Id: I3c8ae3c67f2459c13b885ed935bb1dc31e09c359
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-11-20 12:44:15 +01:00
Robert Loehning
696c898377 Squish: Handling different cursor behavior on Mac 
Change-Id: I21dfc2783ee6cb3f83f7ce54a809593cabe03495
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-11-19 16:03:58 +01:00
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
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
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
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
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
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
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
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
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
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
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