feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
42,742 Commits 108 Branches 368 Tags
f3400f62cde013563d6ff34e14da42df298d27d5
Commit Graph

50 Commits

Author SHA1 Message Date
Robert Loehning
0352e54253 Fix copyright headers in Python files 
Change-Id: Id2c60eae52d315b8b133512d978598d1bc187b43
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-02-13 16:52:03 +00:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Christian Stenger
cf211e46cf Squish: Fix expected object 
Change-Id: I49eef9de0c635cd6618d05e0618ce6b0fe8d352e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-30 11:05:53 +02:00
Robert Loehning
9759d3bacb Squish: Fix modifyRunSettingsForHookIntoQtQuickUI for multiple kits 
Change-Id: I3d42920edba4a750c27714d26c9143e48c17fd39
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-28 10:18:06 +01:00
Christian Stenger
edf7557749 Squish: Fix and improve __selectQtVersionDesktop__ 
Change-Id: I05e0038f8baf134e6d01d829bd52812b9128dd60
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-19 17:19:12 +01:00
Sergio Ahumada
c375436847 Fix some typos 
Change-Id: I3be73c2a4d256a0d28e863fd2517a4d7442b34d8
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-03-05 09:39:42 +01:00
Christian Stenger
ae781b1919 Squish: Update Qt Quick tests to reflect new available versions 
Change-Id: I60d4b2ca64825101358774a4e04cceb3040fc630
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-19 14:38:55 +01:00
Christian Stenger
e7297926ef Squish: Update objects after merging BaseValidatingEdit... 
...into FancyLineEdit.

Change-Id: I7e45861783a7bdf160827595b4e455d869884c81
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-18 18:46:18 +01:00
Christian Stenger
207d3f9a3a Squish: Fix running hooked subprocess on Mac 
Change-Id: Ib7879aab6227758373023d0164edfc6f10f0e23c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-31 09:02:47 +01:00
Christian Stenger
7f4c9a19f2 Squish: Unify invoking add custom executable 
Change-Id: If090ca16a9cc358ff38de5564d2e8ef2a2cf8200
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-24 11:12:10 +01:00
Christian Stenger
9f81e79c8f Squish: Fix issue with menu invocation on Mac 
Squish 5 has problems to handle menus on Mac for Qt5.2 builds.

Change-Id: I533f8fcd2c8a2786ae354cd92e92efad0fb1dd57
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-21 10:44:09 +01:00
Robert Loehning
82fdd52e82 Squish: Wait for parsing in __configureCustomExecutable__() 
Change-Id: I798a29aa9a4676edd1493f4973d29f8725e117e5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-01-21 10:40:29 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Christian Stenger
4b4e5f6990 Squish: Qt Quick [12] Application templates are merged 
Additionally there is no more a way of creating a Qt Quick application
from an existing qml file.

Change-Id: I5c1e8d26640fa3e1b865b6cc97745d64b51edc75
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-11-22 16:04:10 +01:00
Robert Loehning
6dd6ce935e Squish: Handle Squish installation path with spaces 
Change-Id: Ia988ceaeab83d3b1b5258024f9c4ee5232eaf43c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-04 15:42:50 +02:00
Robert Loehning
fbdbd11aa3 Squish: Added note about possible problems with netsh 
Change-Id: Ic54abb4d014b8eaf71cbda490e5b4206dbb3da3b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-03 15:05:03 +02:00
Robert Loehning
89225167fb Squish: Removing now unused constant defaultQtVersion 
Its use was being removed in 6078d7e028

Change-Id: Ib27d7e9a7596fc6358edc1e4a09962951d105752
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-06-21 18:01:25 +02:00
Eike Ziller
ef5d3796d5 Merge remote-tracking branch 'origin/2.7' into 2.8 2013-05-23 07:25:34 +02:00
Robert Loehning
e5d6decccc Squish: Updated hook_utils 
Change-Id: I7d2f43a9283f5b8a3edff4888a6b8c3eac076038
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-17 16:35:36 +02:00
Robert Loehning
180b48003f Squish: Added copyright headers 
Change-Id: Icdf2f31f73e8b6eed75954ad31d12d48e00109b5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-15 13:35:01 +02:00
Christian Stenger
8ca5b55a0b Squish: Prepare re-usage of batch editing... 
...of the environment variables for the next run.

Change-Id: Iaf383dfa361971c75be0e180d72ab95c5df83ebe
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-15 08:59:16 +02:00
Robert Loehning
5aa0f06817 Squish: Make __getMkspecFromQmake__() ready for Qt 5 
Change-Id: I9a2776ad30f718b6d201f738e1f1f158110c1f29
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-27 12:12:19 +01:00
Christian Stenger
f1a0af4b7e Squish: Fix running tst_qtquick_creation3 
...when running on build machine and VNC session has been started
by Jenkins. If so, the DISPLAY variable must be set automatically
and we should not override it.

Change-Id: Ic38267256c5ab8889d67fe6a4e7e46dba6515a67
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-15 15:37:36 +01:00
Christian Stenger
d101a3609c Squish: Fix hook into QtQuick and QtQuick UI 
Change-Id: I168ee74464cfc1ae9efbd69f8e0f3cb10cbbf2d4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-04 12:53:08 +01:00
Robert Loehning
482c8c0f6b Squish: Downgraded fatal to warning 
Change-Id: I8bf3e3d562daddd80ece4c23cc1b5373bfe7eefd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-28 13:51:12 +01:00
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