Commit Graph

1195 Commits

Author SHA1 Message Date
Christian Stenger
bdd0c83751 Squish: Configure C-toolchains for macOS
Change-Id: I3d4fcc25ecca8a02e8dbbace4fc063a72cd85a40
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-01-18 14:50:26 +00:00
Robert Loehning
1a6e6ed553 Squish: Configure C-toolchains for Linux
Change-Id: Id2bd1768e2520bbcfdc918939722f7f5935b8fce
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-18 08:35:50 +00:00
Robert Loehning
4d79ffb8f3 Squish: Replace progressBarWait() in tst_debug_empty_main
The progress bar already disappears while we're still in Projects mode.

Change-Id: I7dcf24d1d423eba3057868c4323b2054c99d19f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-09 11:56:18 +00:00
Robert Loehning
611a970819 Squish: Configure C-toolchains for Windows
Task-number: QTCREATORBUG-17406
Change-Id: Iafa1b38f75fa56691e646aaf2fad61504f0706e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-06 10:23:12 +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
7746c31774 Squish: Use different function name in tst_CSUP01
realloc is not being listed by Clang Code Model

Task-number: QTCREATORBUG-17490
Change-Id: I006fee04579706fbf5edf8b890bd7be8e090d01f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-04 14:43:32 +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
Robert Loehning
ae0ea76f07 Squish: Fix timing issue in tst_HELP06
Change-Id: Ic88207d86cf3f926fc4df681be4cfaa1a62ba763
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-04 14:41:54 +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
701ccc5e3b Squish: Fix property of projects kit view
Change-Id: If36d2b0879cf8c8276d68e5a1f1425b6f47fc5dd
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-11-11 16:33:01 +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
Christian Stenger
9b09bf62bd Squish: Fix tst_default_settings
QC now supports C compilers as well, adjust the test to reflect this.

Change-Id: I20f2264b31c1f21384b463beccbc27ab1073083c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-11-07 10:12:52 +00:00
Robert Loehning
bd8c12c94c Squish: Update tst_session_handling again
Someone removed the numbers again.
This reverts commit 816d0010c2.
Also, the sessionList was replaced.

Change-Id: I23e135e5b240321e30097c0d1d48c82cb24b6c49
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-13 09:19:34 +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
Robert Loehning
8acca9f37b Squish: Fix error handling in tst_git_clone
Change-Id: Id59ba23361beb0994f400647680e4facb223d22f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-12 11:02:10 +00:00
Robert Loehning
816d0010c2 Squish: Update tst_session_handling for numbered sessions
Change-Id: I2821f55440e13eeb9ca81589ffd746e713ae0e16
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-10 10:36:19 +00:00
Robert Loehning
54a7188c27 Squish: Cloning installer-framework instead of jom in tst_git_clone
jom's repository can be cloned quicker than Squish can cancel the
procedure, making the test instable. Cloning installer-framework
takes a couple of seconds longer.

Change-Id: I032a4bf60cfd3b070e4c311fbd1dae5b81e8fcd1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-07 10:17:20 +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
Christian Stenger
d1c8c5ded3 Squish: Disable gcc compile check on OSX
Change-Id: I6537bb9e20c9d16689cea520a01b28da8f2ed468
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-09-27 04:43:17 +00:00
Eike Ziller
c635c6b50a Merge remote-tracking branch 'origin/4.1'
Conflicts:
	share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml
	src/plugins/android/androidrunner.cpp
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp
	src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.h
	tests/system/suite_WELP/tst_WELP03/test.py

Change-Id: Ibac4d71d4f4dbe1e4f05052d2f8a2dcfd82edd4c
2016-09-13 12:15:09 +02:00
Robert Loehning
b252733e63 Squish: Use examples and docs from Qt 5 in suite_WELP
Change-Id: Iddfa426e9c6133bd1f12ec8e119816c2d38ba55a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-05 06:46:25 +00:00
Robert Loehning
309be8277d Squish: Use example from Qt 5 in tst_rename_file
Change-Id: Ibf436af685897de730826927f746fc1de0c8f12e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-05 05:30:33 +00:00
Eike Ziller
c56aa52b80 Merge remote-tracking branch 'origin/4.1'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/qmakeprojectmanager/makestep.cpp
	src/shared/qbs

Change-Id: If1787ed23afa786ed2cef57f53c1db642559cbe0
2016-08-31 14:40:38 +02:00
Robert Loehning
06ac9f00c0 Squish: Improve probabilty of dirseparator in generateRandomFilePath
With up to 43 characters it's more probable to
not have a dirseparator in the generated string.

Change-Id: Ib59fc55eb0b78c9796e19006c057571d7d494e40
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-30 09:41:46 +00:00
Robert Loehning
96a9b2bb5b Squish: Strip final newline from expected text
Change-Id: Icc10f3f0efad5a5d803f556037ecbc08fb6503f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-30 09:41:08 +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
4144757331 Squish: Fix object properties
Change-Id: I77e90a09e5b2a35618ad92a22b720c77d82c5613
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-08-16 12:50:35 +00:00
Eike Ziller
112bdc0f88 Merge remote-tracking branch 'origin/4.1'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Id3be48ea1d00fadbec9a56d721688732118aab28
2016-08-15 14:42:47 +02: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
Christian Stenger
991498845a Squish: Fix object properties
Change-Id: I7f19c970cc46f074b76b13633dbc9e57771ed2b4
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-08-12 12:31:25 +00:00
Robert Loehning
68e38b89e3 Squish: Update suite_QMLS
Project template was changed in
b18e084fc0

Change-Id: I89bf518756cd7d7859ffc6e9a56f1aed2e7e435f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-12 10:34:59 +00:00
Robert Loehning
5dd44e0a7b Squish: Update testdata for tst_simple_analyze
Project template was changed in
b18e084fc0

Change-Id: Ib37b1e5c5c30f75bac302d605403755c8f450fbf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-12 09:50:02 +00:00
Robert Loehning
aa29fcf1fb Squish: Update tst_SCOM02
Project template was changed in
b18e084fc0

Change-Id: I4959c15a452cf713cad86af10b81376b59b816b0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-12 09:49:52 +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
Robert Loehning
81bae84411 Squish: Stabilize tst_simple_analyze
...by giving the Quick app more time to finish.

Change-Id: I788715bcfa0949ee1873295eb869fb4e04fd00b1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-01 16:21:39 +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
Robert Loehning
84f84890fd Squish: Use shadow builds in tst_debug_empty_main
So MSVC2010 and MSVC2013 don't get in their way.

Change-Id: Idb248e86dbe904e2f3867d793b80119f7e2dc31c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-27 10:03:05 +00:00
Robert Loehning
9f3eaaf5e2 Squish: Use shadow builds in tst_simple_analyze
So MSVC2010 and MSVC2013 don't get in their way.

Change-Id: Ie4696ce1afa695a6db109945ab506ce195322656
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-26 09:15:21 +00:00
Robert Loehning
f562f867fc Squish: Use shadow builds in tst_simple_debug
So MSVC2010 and MSVC2013 don't get in their way.

Change-Id: Ib32c30dc0cc960756bb423348d88452aa20fbfcd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-25 12:36:58 +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
9600033abc Squish: Fix long outdated messages
Should have been done with
bef8f58fe8

Change-Id: I25730c97fc77cb560d892738545775d024ce5eeb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-20 13:50:55 +00:00
Robert Loehning
38c7ce6518 Squish: Expect parameter amd64_x86 for MSVC2015
Change-Id: I7a8e1659ca88dc2aaff5129bf2fcf3e7014fe577
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-20 11:11:29 +00:00