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

163 Commits

Author SHA1 Message Date
Robert Loehning
a96f755be8 Squish: Improve object name 
Change-Id: Ic0286a659f08c1ee7258ca5c9a13b2e3df647ed8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-03-20 10:17:28 +00:00
Robert Loehning
621ad7bd77 Squish: Update tst_simple_analyze 
Change-Id: I64efc1fa64ba1dd3eea065a39a56eb286ab78b10
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-03-20 10:17:19 +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
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
Robert Loehning
0fe03e90b1 Squish: Enable tst_qml_js_console again 
Task-number: QTCREATORBUG-15831
Change-Id: I31dc06c39c2c038205d2512804757c4d7b3429b7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-02 10:29:47 +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
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
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
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
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
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
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
Christian Stenger
0e331a2e29 Squish: Adapt to changes in Quick Application template 
The template has slightly changed in 6b506b34ec.

Change-Id: Id58e67beacaac046c6dd235b715f360dc7ef4c09
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-30 12:35:39 +00:00
Robert Loehning
9e63807134 Squish: Remove workaround for fixed bug 
This reverts commit ca66ad3d0c.

Task-number: QTCREATORBUG-15806
Change-Id: I2e81aa5c0fe014be6dda32b326ab3d4a1bfd9600
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-04-15 13:19:59 +00:00
Robert Loehning
ca66ad3d0c Squish: Expect missing breakpoints in qml 
Task-number: QTCREATORBUG-15806
Change-Id: Id7b5966a4ae6fafe979f7373718b89fdcc2b918b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-04-07 14:40:59 +00:00
Robert Loehning
513cc235fe Squish: Clean up expected fails 
Change-Id: I216c6f6453412e65c48ddceaf950bd1112c32a42
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-04-07 10:29:30 +00:00
Christian Stenger
6ffbb88b7b Squish: Adapt to changed tool tip 
Change-Id: Ib6f01cdad6a8e54010ad455cb7e9322d6311dc12
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2016-04-06 15:16:47 +00:00
Christian Stenger
f7a1c1caa0 Squish: Disable testing QmlJS console 
This has changed too much and must be rewritten.
Due to other issues this is not easily doable, so disabling this
test for now.

Task-number: QTCREATORBUG-15831
Change-Id: If0c7866b1f68a32c0696636fc76aed9bbe2ea921
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2016-04-05 10:21:13 +00:00
Robert Loehning
1b0d00ef0c Squish: Update tst_simple_analyze 
Change-Id: I902e1e70bd195cf0108efdc8893927a101e93a42
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-03-10 12:32:51 +00:00
Robert Loehning
ed1f8b9d1f Squish: Update tst_simple_analyze 
Change-Id: Ifba9af5446fec3daa42aa9794a26d02e23b8459d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-24 14:05:08 +00:00
Eike Ziller
74cdce071f Merge remote-tracking branch 'origin/3.6' 
Conflicts:
	src/shared/qbs
	tests/manual/proparser/main.cpp

Change-Id: I13654bf10c14eb6b1d6805fe86b67ac73b2e4d75
 2016-02-24 10:08:37 +01:00
Robert Loehning
cb7b24be15 Squish: Try to stabilize tst_qml_js_console 
Change-Id: I9de2d7784954ebe658530505ba64e816a95d411c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-03 13:53:36 +00:00
Tobias Hunger
954569387c Update License according to agreement with Free Qt Foundation 
* Update license information in tests directory

Change-Id: I311441dd37d053ca3175e44b284258e232ee93e0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 16:01:06 +00:00
Eike Ziller
ad6c0f9bc6 Merge remote-tracking branch 'origin/3.6' 
Change-Id: I8f034f91de04e319dd5ba24b8837f1daca54d918
 2016-01-07 11:01:14 +01:00
Robert Loehning
ef39a087c7 Squish: Remove workaround for fixed bug. 
This completes the revert of
commit 89d8693107.

Change-Id: I359ce87b0d29dc242c9ee9d7c04e025859ff5b31
Task-number: QTCREATORBUG-15456
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-01-05 15:36:58 +00:00
Eike Ziller
ff60bf37c9 Merge remote-tracking branch 'origin/3.6' 
Change-Id: I8223551aec66539dd8c55262e5000c1621410334
 2015-12-15 12:21:58 +01:00
Robert Loehning
8a650b8c23 Squish: Remove workaround for fixed bug 
Change-Id: Id639f455b41e3b96d6867dbeb0b7af5c614cffc7
Task-number: QTCREATORBUG-15457
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-12-10 13:04:17 +00:00
Robert Loehning
b2321e04f1 Squish: Finish update for tst_qml_js_console 
Change-Id: I5efd9e93a22beed24e770c2015e7239576be6438
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-12-10 11:37:56 +00:00
hjk
33651877d8 Move QmlConsole to Debugger 
Now it is closer to its only user and possibly reusable for no-QML uses
there.  We also drop the QML/JS syntax checker. The application being
debugged can already tell us about syntax errors. There is no need to
duplicate that functionality.

Change-Id: I2ba151f9f4c854c6119ba5462c21be40bddcebf9
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-12-09 12:06:26 +00:00
Robert Loehning
89d8693107 Squish: Work around bugs in tst_cli_output_console 
Change-Id: Ief5f731b3ff84dcbd34f4200acbe2646847c0f1c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-12-07 13:41:20 +00:00
Robert Loehning
4d4eb4da22 Squish: Remove pointless tabs from tested code 
Change-Id: I030aeff529c24730a13087fd9554d1f60a0e7462
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-12-07 10:20:22 +00:00
Robert Loehning
f3400f62cd Squish: Remove workaround for fixed bug 
Change-Id: Ifac94dfc27b0cb5f230d7b137bafabaa82a6773c
Task-number: QTCREATORBUG-14307
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-10-01 08:59:08 +00:00
Robert Loehning
335f6e4363 Squish: Stabilize tst_cli_output_console 
Skip frequently failing qDebug output from Qt 5.4.1 MinGW.

Change-Id: I20d0fed184e3935484179e9509c902eb94e48ead
Task-number: QTCREATORBUG-15067
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-21 12:27:00 +00:00
Robert Loehning
73fbf3afd1 Squish: Don't check state of closed bug 
The bug is fixed in master so checking for
it here in 3.5 is wrong and causes fails.

Change-Id: Idd429cf61734c869ada2728151b2bf6f82f6a240
Task-number: QTCREATORBUG-14307
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-11 12:15:20 +00:00
Robert Loehning
0bf8768152 Squish: Avoid float rounding issues in tst_qml_js_console 
Old value fails with Qt 5.5.0.
Changing binary value 0.00110011 to 0.0011.

Task-number: QTCREATORBUG-14757
Change-Id: I6de62241089d50256cfef6f7cba61389da58b6ed
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-07-24 11:05:18 +00:00
Robert Loehning
f1af0c4f39 Squish: Tiny update to tst_cli_output_console 
Change-Id: I26409008831afb70031591a599e0fa3d47d05f38
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-07-14 11:04:50 +00:00
Christian Stenger
f54b7d63cc Squish: Fix tst_simple_analyze 
Change-Id: Iac334d37a1cf6a85d4f85d09165503f9bca8ce91
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-13 14:43:11 +00:00
Christian Stenger
f5b9a2f4ef Squish: Fix tst_simple_debug 
Change-Id: I8d90c0279d73a1902627d76388a5fa5497fb520d
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-10 14:55:29 +00:00
Christian Stenger
a32a9b3d2a Squish: Fix tst_qml_locals 
Change-Id: I1667d966e2686dd3de8ef495d3db7b10d0b6aa5e
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-10 11:30:04 +00:00
Christian Stenger
67371fcd3a Squish: Remove workaround 
Change-Id: I2744c44dda2ef31b7e94dc3328e40538a7a24f40
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-10 11:27:23 +00:00
Christian Stenger
6b471b2b04 Squish: Fix tst_qml_js_console 
Change-Id: Ief0cc9622572b79eec402be5a39816f329dc1e22
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-10 04:53:45 +00:00
Christian Stenger
9cb59772dc Squish: QmlProjectManager is re-enabled by default 
Change-Id: I91e12547843053c5de5ab5bd1af88977e937f80e
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-09 13:53:32 +00:00
Robert Loehning
da2b1cfa4e Squish: Don't analyze kits which take too long 
Change-Id: I18e2cb163f2aef81ca34994a38ceb4865b2ae5ad
Task-number: QTCREATORBUG-14307
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-05-19 09:08:56 +00:00
Robert Loehning
1d0e61a52c Squish: Work around items not expanding 
Task-number: QTCREATORBUG-14210
Change-Id: I64e5b53c5cb82b961ec100d73f0987d79d68f5b4
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-04-01 11:12:29 +00:00
Robert Loehning
434c99f08e Squish: Remove outdated workaround for Mac 
Change-Id: Id2554aa15eb32511f56386941044fa322fab767c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-25 14:39:24 +00:00
Robert Loehning
559d8dc203 Squish: Fix tst_simple_analyze 
Change-Id: I56a7c2a651fc9d2701cf650279a677856b6cf84c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-09 14:36:56 +00:00
Robert Loehning
243a0e54be Squish: Fix bitwise operators for selecting kits 
Change-Id: I4373e8f07b124f61a743d5c922a45f2962ac7392
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-19 13:35:45 +00:00