feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
68,568 Commits 108 Branches 368 Tags
ac47d51bfb379b8c3b51d832d54a90dba18a518f
Commit Graph

1569 Commits

Author SHA1 Message Date
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
Robert Loehning
7a40d31598 Squish: Use example from Qt 5 in tst_QMLS03 
Change-Id: I655f6f01bea097c6ea5874814fd1d267c2e85ffa
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-20 09:05:03 +00:00
Robert Loehning
853a1b2f63 Squish: Wait for ClangCodeModel and catch error 
Change-Id: Ia8c52126209697c1bf48a8fa1e422ec2c8869640
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-20 09:04:52 +00:00
Robert Loehning
a7933e9372 Squish: Use example from Qt 5 in tst_qml_outline 
Task-number: QTCREATORBUG-15469
Change-Id: Ib719e31e53f23a51c4971a53eaa870f4833ef748
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-19 09:20:44 +00:00
Robert Loehning
2fceaa1bfb Squish: Test for wrong manually triggered completion 
Task-number: QTCREATORBUG-16607
Change-Id: Ief65726e360db06e6110e19062f37beccc8f8548
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-18 14:00:28 +00:00
Robert Loehning
d13014ee26 Squish: Don't expect fail from closed bug 
Task-number: QTCREATORBUG-16188
Change-Id: I503645b02e71aa7ed1e50da042a6fd5aa7be0b1d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-18 14:00:10 +00:00
Robert Loehning
75e47e03e3 Squish: Use examples from Qt 5 in tst_session_handling 
Change-Id: I038f04b4c6243dfb37516560ca23001d854c1a4f
Task-number: QTCREATORBUG-15469
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-18 13:59:49 +00: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
Eike Ziller
7e1b4ccebb Merge remote-tracking branch 'origin/4.1' 
Change-Id: I041b949aff8bee481a572ba6f7e2ef72b9010923
 2016-07-15 14:10:38 +02:00
Robert Loehning
3685499785 Squish: Update Creator's sources to v4.1.0-beta1 
Change-Id: I7176f77a55816bc35184b9689838b78b8d0baff7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-13 12:11:11 +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
ff9a49f99f Squish: Adjust expected times in tst_simple_analyze 
Change-Id: I950d5bdebaaddd63a7a1b0994337fdcb9b806e23
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-12 13:51:29 +00:00
Robert Loehning
ad3a515beb Squish: Update expected error message in tst_SCOM04 
Change-Id: Id1576167daf5b3284f525f33988c066bd4f154cf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-12 09:32:32 +00:00
Robert Loehning
0d4f4d9ba6 Squish: Update ToolButtons for debugging 
Change-Id: I360fab668c2de233aba1b9da06b2769314d343d5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-11 09:55:32 +00:00
Robert Loehning
0dec19173c Squish: Only snooze if bug still requires it in tst_memberoperator 
Change-Id: I746007c319823cc7fd166c35f8f94f69badd623b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-08 12:46:00 +00:00
Robert Loehning
70e328c860 Squish: Wait for ClangCodeModel in tst_CSUP02 
Change-Id: I02d5647128492db7d2fce3bf84105f98029ac14f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-08 12:45:27 +00:00
Robert Loehning
fe8c717a6a Squish: Update QGroupBox object for tst_CSUP01 
Change-Id: I247285ba75d474a5c80592607c349b19f5add937
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-07 13:44:07 +00:00
Christian Stenger
87ab577992 Squish: Adapt to changes of wizard template 
Qt Quick template does no more use a pri file.

Change-Id: I5418d1b945c8981218ddcbcf5423d6c623b377b6
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-07-01 10:06:22 +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
Robert Loehning
e065ab2cd3 Squish: Handle empty selection in QWebEngineView 
Change-Id: I7e4d53483f3168e78024dcf87125b44f96453fa2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-06-29 13:58:06 +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
Eike Ziller
33210099f1 Merge remote-tracking branch 'origin/4.0' 
Change-Id: I9793f0f9019b16f3725c5a9708a5ccf81557cdc6
 2016-06-03 09:50:43 +02: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
Eike Ziller
73bb92c5a6 Merge remote-tracking branch 'origin/4.0' 
Change-Id: I89c52ca2145a43c94d3366367ba72fde605dd577
 2016-05-31 12:02:13 +02:00