feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
27,988 Commits 108 Branches 368 Tags
7cb50891ddd1ad5525e7d36df43ff6e3835d8f45
Commit Graph

24 Commits

Author SHA1 Message Date
Robert Loehning
7cb50891dd Squish: Don't use global variable for __isWinFirewallRunning__() 
Change-Id: Iaad1da549addbb856515ae95ece4ae43246637fa
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-28 13:33:46 +01:00
Robert Loehning
fac11973af Squish: Syntax fix 
Change-Id: I33dcde34b176b5918d976c3e474a7702b53a2fa3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-28 11:55:40 +01:00
Christian Stenger
18089cea55 Squish: Skip hook-into for mismatched Squish version 
If the Squish version of the running AUT and the subprocess do
not match hooking into the subprocess fails because of using
different protocols.

Change-Id: I2e94c5ec2fbdc30aa39885bf1619df445c10f40b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-07 16:57:58 +01:00
Robert Loehning
ec1d081178 Squish: Fix hooking for multiple kits 
Change-Id: I5389d6aadd39f6c7f7ca6a74e006b110373eee28
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-06 13:49:14 +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
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
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
Christian Stenger
ec1fd75f7b Squish: Fix hooking into Qml project 
Change-Id: I358a6ac7acacb44f23161019d3d2a83e5d6e84cc
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-08-24 16:36:42 +02:00
Christian Stenger
f1c5b1e78d Squish: Fix __configureCustomExecutable__() 
Change-Id: I76ebec620ece569b895f381e9b35f3b257fe4852
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-08-22 16:22:28 +02:00
Christian Stenger
6078d7e028 Squish: Fix handling of project settings 
This patch handles the removed Qt version combobox.
If applied this should let some more tests (using compile or debug)
run to the end.

Change-Id: I288eda85eb7bdc62309252bfe883608a50b7fb8d
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-08-07 14:23:51 +02:00
Christian Stenger
eeb7ecbb40 Squish: Fix for UI change 
Additionally changed waiting for TargetSelector
from 20s to only 5s.

Change-Id: I2e342faa6f87b86335bb01f28832ad9c01a27ffb
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-06-18 20:13:58 +02:00
Christian Stenger
d77d0ae504 Squish: Fix for UI change 
Change-Id: Ida522c026c41c8cd5bd29b9cca3bb6b9334c84c4
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-06-12 09:35:09 +02:00
Robert Loehning
0e0158fc3f Squish: Cleaned for-loops 
Change-Id: Ide5313c8838aa7ad9ad74cbaed12872ce0a35413
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-02-22 16:58:01 +01:00
Christian Stenger
d6e11fb91f Squish: Fix obsolete parameter 
Change-Id: Ie21ef72546408158d0d487d5b8dccf4d7ee2603f
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-07 13:35:15 +01:00
Christian Stenger
5a4d984b09 Squish: Improve qmake query 
qmake -query QMAKE_MKSPECS can return a list of paths

Change-Id: I349adbccab27e613f4b21e27f610578c35b1e6b8
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-07 12:58:13 +01:00
Robert Loehning
d2f8baad67 Squish: Fixed selection of generator for CMake project 
The generator must match the mkspec of qmake in PATH.

Change-Id: Ibd6d345c202719cdf2a8e8a5e2a5fce470732d5b
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-27 17:23:48 +01:00
Christian Stenger
85d78c2437 Squish: Reset to normal 
Don't work around a bug.

Change-Id: I84bd88fa3f0b39fadd1816f39bdd8ba7b8792a90
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-27 09:52:51 +01:00
Christian Stenger
26796f6024 Squish: Try to make this run on Jenkins 
I'm not sure for this - but LD_LIBRARY_PATH is always empty for
me. But inside Jenkins it's set and could mess up the hook into
sub application.

Change-Id: I2f3283f67d60a94083a5eb589abed01b05e66b29
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-20 14:41:10 +01:00
Christian Stenger
7524fff3c5 Squish: Fix timing issue on Linux 
Change-Id: Ie9ca285bf2ca364db6e56b4aff244b9253d11e67
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-01-13 14:50:02 +01:00
Christian Stenger
595f4ce2d5 Squish: Don't use expected paths if non-existent 
Change-Id: I8685a91f2e821134347ab693d415a7c26cc6c8f6
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-11 11:11:02 +01:00
Robert Loehning
f5a737e0cb Squish: Qt version tooltip now uses native dir separators 
Change-Id: I157640df29abd4d0a1d02e4579f1b37f1346b784
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-12-12 17:32:09 +01:00
Christian Stenger
86ba284d06 Squish: Improved and refactored hook into 
Change-Id: I05f17bbe49db7064cd6bf5131363ca0708aad087
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-12-02 15:03:18 +01:00
Robert Loehning
fe4c9053d8 Squish: Update for label renamed in master 
Change-Id: I8ad167cca8c878efd67eca9ac48b4df237d31726
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-25 16:00:22 +01:00
Christian Stenger
3089bd3f6c Squish: Implements hooking into the subprocess 
Change-Id: Ic1ae2a8341d01e179f9d52b7c7ad3cbe24995bd1
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-11-23 15:49:04 +01:00