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

1195 Commits

Author SHA1 Message Date
Christian Stenger
2ed55c8076 Squish: Provide function for writing out results 
...in preparation for adding these to the automatic statistic thingy.

Change-Id: Ieeab062b426ac3b9053d0499fdb38f0abacb89c9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-06 08:49:38 +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
4f74e04ec4 Squish: Recommending 4.2.3 
Change-Id: I6514b015afffaa15d36103b269b0775ff063c3a5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-01 17:04:56 +01:00
Robert Loehning
65a07823ac Squish: Report error in selectFromFileDialog() 
Change-Id: Ib32a1b78106a298996e1d29207998fc8f312208e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-01 12:49:14 +01:00
Robert Loehning
497eb16455 Squish: Make sure file was opened in tst_select_all 
Change-Id: Iad2c590fd7cc87d8267ecdca515dbef48480e9ed
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-28 17:47:25 +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
Robert Loehning
4d7e1c43db Squish: Tuning tst_select_all 
Change-Id: I14ba2d2eee033a6e779cd1cca47e25572020dc40
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-26 12:58:53 +01:00
Christian Stenger
86d3e075ff Squish: catch plugin loader error if it occurs 
...and stop execution of the current test case

Change-Id: I46ac21e79f643f6890b7303d08c204dcd9fa9386
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-22 16:52:13 +01:00
Christian Stenger
4a78d4da3f Squish: Fix wrong signal handler call 
Change-Id: I94020e0afa85a86f5eb80fe4cf1cbb4c58edb6a6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-22 16:43:40 +01:00
Robert Loehning
7c9d2e3a1a Squish: Fix invoking context menu sub items 
Change-Id: I7d498ac3d4e2e2d25b3c504a95f96e434d0d1619
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-21 13:55:45 +01:00
Robert Loehning
40a1b4afb7 Squish: Updated updated expectedText in tst_QMLS02 
Change-Id: I7177e8b1b84fb780c5e1706a2979b6da8c71edda
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-20 15:35:04 +01:00
Christian Stenger
80263a5221 Squish: Fix some Mac/Squish issues 
Details:
* wrong shortcut usage replaced
* timing issues fixed
* re-used the editor-focus-on-mac workaround for some tests

Change-Id: Ie0d65d941c999d545bd50e1cf4794624c4110247
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-18 12:56:46 +01:00
Robert Loehning
dd32d14a55 Squish: Removed unused functions 
Change-Id: Ia9b63b9d4846b425cfa52ded0a0f5f54f4c4f0ed
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-18 12:16:04 +01:00
Christian Stenger
85ec0cdfbe Squish: Improve ensureChecked() 
...to avoid misbehaviour especially on Mac.

Change-Id: I25053ea34b180a60d9a260798f7758df8a1224e2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-15 14:31:55 +01:00
Christian Stenger
cbb934455a Squish: Fix QMLS04 on Mac 
Change-Id: Id5f5fd0dbd77ad8ad39cfa3e482ec688c35f932d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-15 09:17:23 +01:00
Christian Stenger
b090616016 Squish: Fix tests for disabled Madde Plugin 
Part 2: Fixing evaluation of configured kits depending on available
Qt versions as well as determining supported platforms.

Additionally enable verifications for Plain C and Plain C++ projects
as well.

Change-Id: I1f92b44c6771dfc9353b911fdb1ec654c5cc591b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-08 17:04:57 +01:00
Christian Stenger
dae2198346 Squish: Fix tests for disabled Madde Plugin 
Part 1: Fix expected targets

Change-Id: I4acfcde6c6d347065047e91f6d65b6418aade7b3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-08 17:04:49 +01:00
Robert Loehning
90ffdd8a6f Squish: Updated expected project tree to fixed behavior 
Task-number: QTCREATORBUG-8706
Change-Id: I0a7c3defec04417014dd185f501642ad37a12ff2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-08 15:07:26 +01:00
Christian Stenger
c7ca78afd0 Squish: Revert unsuccessful fix for build-machines 
Change-Id: I47865c18ba24ce8a732046597fe27f32c4edf3e3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-08 13:15:19 +01:00
Robert Loehning
ca4b3f9d1d Squish: Wait for parsing in createNewQtQuickApplication() 
This is what createProject_Qt_GUI() and
createProject_Qt_Console() have always done

Change-Id: Iaead1767c699e4fd237d999e6f3d94d277b1d84f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-08 10:30:37 +01:00
Christian Stenger
adc619c045 Squish: Update squish mapping file for new versions 
I've now provided the stripped down versions of Squish 4.2, so it's
time to update the mapping file as well.

Change-Id: Ie85c9c1a704d5d30a535ff197a5f8897f5259eb1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-07 17:27:34 +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
a3bdff07ac Squish: Fixed SCOM05 
Change-Id: I1ea55b1ffc811cb986eee28983f27a838e156805
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-07 11:35:22 +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
8485f64c6b Squish: Fix verification of compile output 
Change-Id: I1c55e826a79fa0f36d2870cfcb08a325ba6408e1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-04 16:47:05 +01:00
Christian Stenger
675b33e832 Squish: Let tst_rename_macros continue if it fails 
Change-Id: If4836259220f6439e7f2cc958ecfb19b56c94573
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-04 13:55:08 +01:00
Robert Loehning
fc9ed4960d Squish: Fixed tst_qml_editor 
Change-Id: Ice53977c5d747d0e38943274e269c31c48bf14c3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-01 17:09:49 +01:00
Christian Stenger
df1f7796ba Squish: Fix tst_SCOM05 
Change-Id: I63b5266639a272ee94cc50978f87634f09ff4177
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-01 13:01:05 +01:00
Christian Stenger
e9f219c335 Squish: Fix tst_QMLS04 
Change-Id: I16e4873bf33433b2b87229506f300300faa9ef9c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-01 09:02:22 +01:00
Robert Loehning
f71486fa4d Squish: Fixed tst_modify_readonly 
Change-Id: I8cce1e72dceb1085cb42f2cfa2bf8a7db721c564
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-31 17:31:58 +01:00
Christian Stenger
893b3da55d Squish: Fix tst_WELP02 
Change-Id: Ie45909e9967fdb1333da25bc85f93195374f44da
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-01-31 16:24:37 +01:00
Christian Stenger
58c45ca766 Squish: Added test case for default settings 
Change-Id: I669a4a464b966ef9cf5a89f38e95e142e3574a1c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-01-31 16:16:33 +01:00
Robert Loehning
0a35cae99d Squish: Fixed tst_qml_indent 
Change-Id: I9edd5410896401810b5106049832c36221b155d3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-31 16:02:57 +01:00
Robert Loehning
6ebb71ab57 Squish: Fixed tst_simple_debug 
Change-Id: I12053784d9d897525e29c40ea806f680577c6c09
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-31 14:27:27 +01:00
Robert Loehning
14839e8acc Squish: Fixed suite_CSUP 
Change-Id: Iab9acd6124c70397a3eff0a697fc8df4b663cc1a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-31 13:34:01 +01:00
Robert Loehning
58e4a5fb5e Squish: Fixed opening of files 
Change-Id: Ia96a4a000cac1dde0f660e5f58141a73c7625a1e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-31 11:22:17 +01:00
Oswald Buddenhagen
f1cec4629e Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/libs/utils/tooltip/tips.cpp
	src/plugins/coreplugin/versiondialog.cpp
	src/plugins/projectexplorer/kitinformationconfigwidget.cpp
	src/plugins/qnx/blackberryapplicationrunner.cpp
	src/plugins/qnx/blackberrydeployconfiguration.cpp
	src/plugins/qnx/blackberrydeployconfiguration.h
	src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp

Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
 2013-01-29 15:52:36 +01:00
Christian Stenger
4cb9f675aa Squish: use new approach for markText() 
This new approach is a bit slower than using Qt functionality,
but it's now completely relying on user-interaction.

Change-Id: I361f6f201dfff8122a11aae30204eb79967fe4ae
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-01-28 17:07:12 +01:00
Robert Loehning
31b135a4b1 Squish: Updated opening of CMake projects 
Change-Id: Iad89199052fe8df090eb5a6257dd88de51a15a07
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-28 15:19:48 +01:00
Christian Stenger
128df0f4b4 Squish: Improve Outline test 
Added signal, property and function elements.

Change-Id: I3d98bb43baaec45e34cd24963e4d8b64ca624792
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-01-28 14:10:26 +01:00
Robert Loehning
db7d64f15f Squish: Made tst_cli_output_console more robust 
Change-Id: I00941b2d6f984e3af553d48fdfa747f3d6d1ffd8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-24 17:05:18 +01:00
Robert Loehning
28d731c717 Squish: Exit test cases if runAndCloseApp() failed 
Change-Id: I9149673fc1c227543b6d92ece0ed00a993e06ccf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-24 16:40:20 +01:00
Robert Loehning
3f570a7901 Squish: Enable testing with MSVC again 
Change-Id: Ib6051caa6e3a52a611aa24c0bf0c4d89939fdd58
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-23 12:06:26 +01:00
Christian Stenger
00dab06535 Squish: Added test for QML outline 
Change-Id: I6199cf22da0049319c2eaef6977884ed7f63a4fd
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-01-18 13:58:33 +01:00
Oswald Buddenhagen
65c169c80e Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidrunner.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6
 2013-01-16 16:46:03 +01:00
Robert Loehning
1675beebf3 Squish: Fix WELP03 
Change-Id: I811c394b95029addb84a727632cf2ab6901258a5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-11 14:35:30 +01:00
Christian Stenger
0ba7f48d07 Squish: Try to fix test for testing machines 
Change-Id: I3213594c9ad7b947c5863d22f87e62adf418d983
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-01-09 13:06:13 +01:00
Eike Ziller
a8a33b9a3b Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68
 2012-12-14 08:20:49 +01:00