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

562 Commits

Author SHA1 Message Date
Robert Loehning
5b9450a3d3 Squish: Remove workaround for fixed bug in tst_simple_debug 
Change-Id: Iad0fd8fb2a591dce86ebc05fc0d32e828193e298
Task-number: QTCREATORBUG-17492
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-04-03 12:12:13 +00:00
Eike Ziller
26e76d3387 Merge remote-tracking branch 'origin/4.2' into 4.3 
Conflicts:
	src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp

Change-Id: Ic9215ea50fdbe71610da893cc7999cc1e65b0690
 2017-03-22 10:21:59 +01:00
Robert Loehning
262141a0dc Squish: Make workaround permanent in tst_simple_debug 
The fix is in 4.3

Task-number: QTCREATORBUG-17492
Change-Id: If155bd9b16a119e7b91161788708c21653222f8d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-03-20 15:06:34 +00:00
Robert Loehning
4522f42e68 Squish: Remove outdated workaround 
Task-number: QTCREATORBUG-6853
Change-Id: Id274e8e277338a9855ee5901c767b0f1d0f489da
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-03-20 10:17:03 +00:00
Eike Ziller
8aed66706e Merge remote-tracking branch 'origin/4.3' 
Change-Id: I805dfecf9a385d4c4798049272e19e5b70bc698d
 2017-03-13 14:52:56 +01:00
Christian Stenger
afbbb65e6b Squish: Fix suite_WELP 
Change-Id: I3592f62fa1815d3c7bbd3a6433405bfec0ee020b
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-03-13 11:49:05 +00:00
Christian Stenger
1ffd752e02 Squish: Fix suite_qtquick 
* adapt category label to expected
* adjust to removed library wizard

Change-Id: I799882c9c7557c5d7f4c36fb4d2198f8e586b435
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-03-10 12:48:43 +00:00
Eike Ziller
cec29f34ea Merge remote-tracking branch 'origin/4.2' into 4.3 
Conflicts:
	doc/src/qtcreator.qdoc
	tests/system/suite_general/suite.conf

Change-Id: Ia298b177d6920a1d853e342b62cf98f7c48a278a
 2017-03-09 12:14:55 +01:00
Robert Loehning
785a982a64 Squish: Protect ALL_TARGETS against accidental changes 
Change-Id: I45efe55b87fb1e02e1b4016c9d94353c1823604a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-03-03 15:19:16 +00:00
Christian Stenger
d301824886 Squish: Adjust tests that use Qt Quick UI wizards 
Qt Quick UI had been slightly renamed and Qt Quick Controls UI is
gone.

Change-Id: I990af2bc83513ad8d85838b037e79dc88bbfdb73
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-03-03 12:40:38 +00:00
Robert Loehning
9c118fb8f2 Squish: Add function returning all available kits 
Change-Id: I6699ad5c869dbbd413d0b1d113a169c2ec06511c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-03-03 12:32:51 +00:00
Robert Loehning
f78327a571 Squish: Use list instead of bitfield for kits 
Change-Id: Ia2e1f3aa9ea723deb9f2a2c88e2f97be8ae0e833
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-03-03 12:32:36 +00:00
Christian Stenger
9423f3414b Squish: Handle build system on wizards while creating new projects 
Change-Id: I81480e5371767df0f7b4923b80cb49e00ff1c657
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-03-01 08:17:56 +00:00
Eike Ziller
1704c484a8 Merge remote-tracking branch 'origin/4.2' 
Change-Id: I9006dd493707ae626ae3502541599c8789e1aab0
 2017-02-27 15:17:37 +01:00
Robert Loehning
062678a937 Squish: Add some debug logging to openDocument() 
Change-Id: If34eaad1bd04a7d2409f0e00c217c7bd12add106
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-21 10:49:37 +00:00
Christian Stenger
374a51b2e0 Squish: Adapt tst_WELP04 to latest Welcome page changes 
Change-Id: I835bbcf3676816d92160b2eca967af4adcd3876a
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-02-16 05:42:28 +00:00
Christian Stenger
9f6f5bfee2 Squish: Adapt tst_WELP02 to latest Welcome page changes 
Additionally move common used code for interacting with the
Welcome page into separate file.

Change-Id: If863ae529c7c81d095f310f0a34926b324c77fa8
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-02-13 11:58:30 +00:00
Robert Loehning
eea9090088 Squish: Remove ancient mobile kits 
Change-Id: I0bb6e2b0f61e7618a166004b418b70efa752a75f
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-02 10:29:02 +00:00
Christian Stenger
9d328ef1a9 Squish: Fix adding new kit 
Projects view has changed and so has functionality of adding a new kit.

Change-Id: I44377822b8b850fd17be24e12f7e5d0104be568d
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-01-06 05:51:59 +00:00
Robert Loehning
2a6c315fbb Squish: Workaround unexpected error message 
Task-number: QTCREATORBUG-17492
Change-Id: Icda68a756b3420baa494e90c41dbefc656ae6327
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-01-04 14:42:18 +00:00
Christian Stenger
3ffec118d0 Squish: Fix switchToBuildOrRunSettingsFor() 
Properties of the model indices did change recently and so
checking for enabled does no more work - use its toolTip
content instead to check for the enabled state.

Change-Id: Idc2b5ed1a0a14cfabdbdb4231eab243d28c0aee7
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-12-21 10:58:05 +00:00
Christian Stenger
be9c7d6929 Squish: Fix triggering items listed under "Recent Files" 
UI has changed again, so adapt the test to reflect this.

Change-Id: I5d6bcf2b48b8b625f6086f5a1101041a73d7e329
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-11-14 06:53:31 +00:00
Christian Stenger
43b376a738 Squish: Handle wizard check for Quick Controls 2 Application 
This wizard needs a Qt5.7 which we are not providing yet.

Change-Id: I03ba5c86835de40a44530753502f87a46554d6b3
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-11-11 11:31:49 +00:00
Eike Ziller
5b47c653c1 Merge remote-tracking branch 'origin/4.1' into 4.2 
Change-Id: Ibe4cd5522e1d87d56d2aae7a429282b41bf18647
 2016-10-12 16:02:47 +02:00
Robert Loehning
b729d6da7f Squish: Update tst_git_clone 
Change-Id: Ie775ae993651b51699ebfedbe6b37c823392435e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-10-12 11:02:49 +00:00
Robert Loehning
169723dd87 Squish: Fix openVcsLog() when an OutputWindow is already shown 
Change-Id: I47432b7367f238a92921bffb030eada902327bd5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-10-12 11:02:27 +00:00
Eike Ziller
90cf4487a5 Merge remote-tracking branch 'origin/4.1' 
Conflicts:
	src/plugins/autotest/qtest/qttestoutputreader.cpp

Change-Id: I4b323f2f3041d015fa04b9a25ec925f3b3e2411f
 2016-10-05 15:28:04 +02:00
Christian Stenger
3adef3cc7c Squish: Remove OSX specific workaround 
Change-Id: I9e43c47c5ef2422d46e10b9f2fd88454b4352c30
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-09-30 10:09:10 +00:00
Eike Ziller
841778ed69 Merge remote-tracking branch 'origin/4.1' 
Change-Id: I80f96f100046625f24b6ab5d13fdb05660365abc
 2016-08-22 16:30:56 +02:00
Robert Loehning
585cc0703c Squish: Remove unused declaration of global variable 
Should have been done in
39103dee4f and
e2adf9b7bb respectively.

Change-Id: I4e16abf8820ed4f1e287505259d71d15e739e996
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-08-17 13:35:29 +00:00
Christian Stenger
5f5d23c389 Squish: Fix triggering "Recent ..." menu items 
These items nowadays have a leading number and colon.

Change-Id: Ib274a7bc601cd06cf7b226f43b011c2b105cc12b
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-08-17 12:22:33 +00:00
Christian Stenger
c8e40f5b56 Squish: Adapt to changed Projects view 
Change-Id: I9728a04864cdef7ae609f6a983cd92aa3c79e4f5
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-08-12 14:10:14 +00:00
Orgad Shaneh
1853f01a5b Merge remote-tracking branch 'origin/4.1' 
Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
 2016-08-05 11:40:07 +02:00
Christian Stenger
c87d0d7b58 Squish: Stabilize test for removal of break points 
Change-Id: I1fdfc654e18a4cb219624b65e5d812faa479eb66
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-08-03 10:16:48 +00:00
Orgad Shaneh
35d7352b3e Merge remote-tracking branch 'origin/4.1' 
Change-Id: Ie96fa53a88bcd06fa688a579c1d84aaf6f5e905f
 2016-07-29 16:13:18 +03:00
Robert Loehning
bde4362dad Squish: Replace Qt 5.2.1 kit with Qt 5.6.1 
Change-Id: I5865024f55a68bc2860f5b8b0b7c9c37775cc122
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-27 10:07:14 +00:00
Orgad Shaneh
1b34f2a4b8 Merge remote-tracking branch 'origin/4.1' 
Change-Id: Ia90424d479936a898705c433e5810c77ae088b2c
 2016-07-22 15:18:00 +03:00
Robert Loehning
9ac9211d64 Squish: Use examples from Qt 5 in suite_CCOM 
Task-number: QTCREATORBUG-15469
Change-Id: I147c0ff6d402b97a1737a4bb57697c88ac7838be
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-15 12:25:15 +00:00
Robert Loehning
c8e83d0adb Squish: Remove outdated version check 
To build Creator, you need Qt 5.6 at least.
To test Qt 5.6 you need Squish 6 at least.

Change-Id: I5b4c08da64df749961544c25f3ed691ff56d2cc0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-13 11:10:02 +00:00
Robert Loehning
c8150dc918 Squish: Click again when hitting scroll bar in openDocument() 
Change-Id: Iae5256c894fbd4fcb8b93fd5b6dbe7b56b428982
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-01 09:19:10 +00:00
Christian Stenger
76781b40a7 Squish: Adapt suite_qtquick to 4.1 changes 
Change-Id: Ic1d178820a3c2b6ce61f9e4fc424bc701eca87e5
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-06-29 12:39:24 +00:00
Robert Loehning
e0b05758c0 Squish: Fix getHelpViewer() for Qt 5.6 
Change-Id: Ica23ec912f95fe10e838e2055d8294be33ef959b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-06-28 16:13:40 +00:00
Robert Loehning
79623d5774 Squish: Base getPaths() on new path functions 
Change-Id: I54cd03bc1d24b715df15de37291f776f9867416f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-06-02 09:35:16 +00:00
Christian Stenger
b04b5e5d75 Squish: Provide functions for getting paths inside Qt installation 
Change-Id: I273304f0c6d451d28a256c99588479525eef95e4
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-06-01 14:50:25 +00:00
Robert Loehning
4117ba7313 Squish: Replace remaining shell usages 
Change-Id: Id7c2c1a17fed053f2e8601fc4c7716705e260431
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-31 14:52:17 +00:00
Robert Loehning
7d51d3849a Squish: Silence more warnings 
Change-Id: I6259382a2359a795654a6d6536112c090ede130f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-31 09:15:35 +00:00
Robert Loehning
7e9aa9c908 Squish: Silence warnings in tst_default_settings 
Change-Id: I668cc7b1fcb569b50d2178fe792f566721c9d4d4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-30 10:40:12 +00:00
Robert Loehning
c1e7cf84e4 Squish: Do not use shell in getOutputFromCmdline 
Change-Id: I731b119169063912cd3b528a1a6a58727002ae67
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-30 09:13:04 +00:00
Christian Stenger
e564abdd9a Squish: Use more stable subprocess code 
Change-Id: I9a895831f9d57562a9eeb8491cc7f46c1da2eba1
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-27 04:35:49 +00:00
Christian Stenger
2b57a1afa6 Squish: Fix handling of context menu on OSX 
Change-Id: I6f5d50eca0199826e8af0f11016a1dfeb924f046
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-26 13:31:25 +00:00