feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
22,648 Commits 108 Branches 368 Tags
d2f8baad67bb18d70f42ed2bc62ced778a46ff20
Commit Graph

100 Commits

Author SHA1 Message Date
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
Robert Loehning
6b1b47d83c Squish: Let CMake build in temporary directory 
Change-Id: Ib2cc65378b74f662652434dd1a65d845ee3fb741
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-27 15:39:21 +01:00
Christian Stenger
591754be7e Squish: Fix minor bugs (mostly on Mac) 
This avoids some timing issues as well as a problem
I only saw on Mac: Sometimes Squish fails inside
placeCursorToLine() with 'I don't know how to type on
object of type QmlJSEditor::QmlJSTextEditorWidget'.

Change-Id: Ifc192914375fb37362fa31399be4972c9ce50b92
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-27 13:33:10 +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
Robert Loehning
c14a4756a9 Squish: Refactored openContextMenuOnTextCursorPosition() 
Change-Id: Ie7a903794c11ed32cc1786c66ee0fa8d654a93f2
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-24 17:50:13 +01:00
Christian Stenger
2663f5d34e Squish: Improve cmake test 
Change-Id: If6cdae302f29cbfe50eb1355b610e8f120bf7681
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-24 12:53:05 +01:00
Christian Stenger
f64a31a09d Squish: Changed fatal to warning 
We still have a fallback and jenkins will
mark this as a problem (while it ignores warnings).

Change-Id: Ie33085c844c7ffbe1985a6b867aef00c7ae8c920
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-23 11:59:41 +01:00
Christian Stenger
14a8ad256e Squish: Make QMLViewer test stable on Jenkins 
Change-Id: I175d10e1a5c23616801ac2c9be298198c89541b2
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-23 11:58:21 +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
Robert Loehning
36573eda7b Squish: Running tst_build_new_project on more build configs 
Change-Id: I413f5393bb8d56842d8132e26123ebe21d89c57a
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-17 16:24:23 +01:00
Robert Loehning
c51a128efb Squish: Fixed typo 
Change-Id: I4b694b0ba007ba7f7d6af37857fca57ceecdc4f0
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-17 15:45:05 +01:00
Robert Loehning
73005e6bca Squish: Added functions for switching build configurations 
Change-Id: I03eb8987ec28bac7db99395ed91952d8a3a0d038
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-17 15:44:47 +01:00
Robert Loehning
ed51dde28b Squish: Fixed and simplified function 
Change-Id: I5177202b366f8373dda05cbe8f4b1ae2e529cc5c
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-13 15:20:34 +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
Robert Loehning
dac69143af Squish: Added helper function for opening files 
Change-Id: I756822299e591010eb926ee46600f4b5231d9318
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-12 12:16:04 +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
Christian Stenger
6571e01725 Squish: Only log compile if failed or debug mode 
Change-Id: I266fb9b7796d810c98e642d3c7a3f682eb05bf6b
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-10 17:25:54 +01:00
Bill King
0f25f3c2cb Squish: Log screenshots on error too. 
Change-Id: Ib9b464c27595c6b5bc10985e6e5c77c41272001c
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-10 12:47:29 +01:00
Bill King
ce5fc68c8d Squish: Add no settings path variable, for runs without pre-settings. 
Change-Id: I12cc0080e2423c48a43937e0f7219357e80d4120
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-09 16:11:25 +01:00
Christian Stenger
d2c9e3f40e Squish: Fix tests on Mac 
Change-Id: Ibedf2bb581a5b0deb7c8e95ec792630e429f1570
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-05 14:06:57 +01:00
Christian Stenger
4e0421ed15 Squish: Add hovering test 
Change-Id: I78a8e855a3b276c1549b57002ced88af3245ccdd
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-05 12:23:54 +01:00
Robert Loehning
4d2d62a6ad Squish: Improved tst_build_speedcrunch 
Change-Id: I09c25505354d9f6a3613e86ef5121ab37857f194
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-12-19 14:05:45 +01:00
Christian Stenger
4ecf2eb3d4 Squish: Fixed a typo 
Change-Id: I4bdad749d82ace835d8051a80cf9b17ad0eb43cc
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-12-19 09:11:00 +01:00
Bill King
6210b0578e Squish: Fix to make selectFromLocator("simple_test_app.cpp") work. 
Change-Id: Id853f58cc3e564a71af768c54c36d731a3be25da
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-12-15 16:16:50 +01:00
Bill King
cfacc486f4 SQUISH: Use env var for src path if available. 
Change-Id: I1844db3bb3dc5eca0c434089288916ac86db775a
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-12-15 16:16:39 +01:00
Robert Loehning
67644e6fc0 Squish: Added function for creating new Console Application 
Change-Id: Ia894d978ebb9b6add3e3ca55bc97054eef98214b
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-12-14 18:19:44 +01:00
Christian Stenger
fb21ad4d3c Squish: Added FindUsages test to QML test 
Change-Id: I2571bf1e87d34495dc4299f04d310f894d22e38d
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-12-13 17:10:14 +01:00
Robert Loehning
78b65c808a Squish: Small fix 
Change-Id: I3bb789950b278dd7ac829555678c126703f6cf52
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-12-13 16:28:30 +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
Robert Loehning
d229705d7b Squish: Checking if the right build configuration is set 
Change-Id: Ib889d1d8269a8c58edc12b688360b94a0b4bdedf
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-12-12 09:24:45 +01:00
Robert Loehning
44e4c45e64 Squish: Simplify selectFromCombo calls 
Done-with: Christian Stenger

Change-Id: Ie9b2691675b12fb4d84f9239358c7db4ab60c431
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-12-09 16:08:11 +01:00
Robert Loehning
8480c3837b Squish: Added utility functions 
Change-Id: I5ac2aabde688e86557ee364bb190e0230ba75822
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-12-08 13:30:16 +01:00
Robert Loehning
c6936d9e80 Squish: Speeding up switching modes by replacing snooze 
Change-Id: Ia13a98e7ae27f4c4643d8efd9a7c25b53fad4dd3
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-12-07 14:46:00 +01:00
Robert Loehning
387d7a20ed Squish: Make invokeMenuItem() handle submenus 
Change-Id: I0e616a254dd4d7800b7a001134c02f301261b956
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-12-06 16:50:08 +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
844b1c0490 Squish: Improved timeouts 
- tuned timeouts according to expected duration
- use default timeout instead of passing equal value

Change-Id: I90bcbc5ecfd420a01e05acabc987a67b322c1f3f
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-29 14:34:21 +01:00
Christian Stenger
b042661686 Squish: Fix this test for Creator master branch 
Change-Id: I3f8a9238af15ec15a94f458ce55cb77a47b248f9
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-11-28 14:06:22 +01:00
Eike Ziller
b50e48a1fa Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	share/qtcreator/welcomescreen/widgets/ExampleDelegate.qml
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/exampleslistmodel.h
	src/plugins/qtsupport/gettingstartedwelcomepage.cpp
	src/plugins/qtsupport/gettingstartedwelcomepage.h

Change-Id: I268072db01064d71bc4828942d71fc772ddd3539
 2011-11-28 08:34:37 +01:00
Christian Stenger
8500fa9f6a Squish: Improve hook-into sub-processes 
With this patch it's possible to not only hook into the
QmlApplicationViewer (although nothing else is currently done)
and additionally to not only send the closing event to the
sub-process. You can now define a function that will be executed
on the sub-process.
Both modified tests show an example how to use it.

Change-Id: I39b9959f2cf1d519b8afeb0c479ac2d68ea20ca6
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-11-25 19:39:41 +01:00
Robert Loehning
0a48570f6a Squish: Update for changed sorting of project wizards 
Change-Id: Ia1a5cbe1ace8e4bed0500e7c46fcff90a10cc7ae
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-25 16:01:06 +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
Robert Loehning
f107ec5ba6 Squish: Made functions verifyEnabled and selectFromCombo more generic 
Change-Id: I1f0d48712f5ec081fa323e929dabaeee1dbf9b63
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-24 17:52:26 +01:00
Robert Loehning
6a1bb10cbe Squish: Added default mappings for Linux 64 
Change-Id: I3b6b6fc0b5c6520e767a7c923be9bd3f3b3b6517
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-23 16:54:24 +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
Christian Stenger
54d5059ec0 Squish: Small fix and improvement for indent test 
Change-Id: Ib34050986433bf9010da2e8cf71fe6651559c015
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-11-17 08:44:39 +01:00
Robert Loehning
fde3e900a8 Squish: Updated Creator's settings to new Qt SDK 1.1.4 
Change-Id: Ic77c7ba0ca101ff0745b8dc89f7a04824c9c7ea1
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-14 17:54:43 +01:00
Robert Loehning
04dfc44970 Squish: No Symbian target on unix-like systems 
The SDK does not provide Qt for Symbian on Linux and Mac so there's no
need to wait for such a target.

Change-Id: I6c48f21317a29f2bfdf7b1fa9d87890a7f74a4eb
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-08 23:55:52 +01:00
Robert Loehning
e465a1763b Squish: Added function ensureChecked 
Change-Id: Icca18645613d0b88e4394aa5fc3820626a59e647
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-08 14:12:40 +01:00
Robert Loehning
c79d8b32b4 Squish: Some more reuse of code 
Change-Id: I3d4e7c0b9d8afc31fb5cfa2bc7879ea999129158
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-08 10:47:19 +01:00
Christian Stenger
8cac157529 Squish: Remove non-default Qt versions 
Change-Id: Ic56fb8f27b92872cac2e24721ecd74253ad25fdd
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-11-03 14:18:34 +01:00