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

121 Commits

Author SHA1 Message Date
Christian Stenger
7f44b1e588 Squish: Added timeout 
Maybe this fix an issue when running the tst_qml_editor
inside jenkins.

Change-Id: I3cec1bf452e1c3cab7cb0aca6854105c774248a8
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-20 10:50:51 +01:00
Christian Stenger
0f703ea068 Squish: Maemo is subset of Harmattan 
see https://bugreports.qt-project.org/browse/QTCREATORBUG-6965

Change-Id: I56852572976806ba74c95b9b40f647d217a95003
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-17 14:32:22 +01:00
Christian Stenger
5b3acc8228 Squish: Use the new 'create project' wizard 
Change-Id: I871b7abe2390e76b1e9b54c2f9809940d0ffa930
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-16 20:19:48 +01:00
Robert Loehning
1f6b88c4c2 Squish: Moved workaround for QTCREATORBUG-6853 to new location 
Change-Id: I4879b5454248d0738c6b3b5ec9b228ec59cdc787
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-02-16 13:04:26 +01:00
Christian Stenger
d766c2e773 Squish: Use single file for workarounds 
This would help to keep the normal tests clean
and mess up only a single file that contains all
workarounds.

Change-Id: Ic26e57bcd13663efe9c882c003909eb0caa6fe9e
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-15 17:46:18 +01:00
Christian Stenger
c4b631f975 Squish: Fix for a bug on Mac 
Change-Id: I97adc821183f0db5db210b9e80917d3afa73de31
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-14 16:48:31 +01:00
Christian Stenger
e714f29326 Squish: Fix wrong object name 
Change-Id: Ie54e8407a613bcd3870f278d334643c434b9e325
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-14 15:40:34 +01:00
Robert Loehning
c85a456352 Squish: Additional log at the end of tst_qml_editor 
Change-Id: I1d1da9b333b76e086319091ad6849eca3dc21fb9
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-02-14 15:10:50 +01:00
Robert Loehning
43b1ad3661 Squish: Added test for (un-)selecting all content of editors 
Change-Id: Id0d768895f74e3686f15817b520552524493e79d
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-02-10 16:47:35 +01:00
Robert Loehning
ef979ae7f4 Squish: Some fixes in cmake test 
Change-Id: I3b15c73ec725f35ca12388e9b59d4a6de21ce7bd
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-02-10 14:14:03 +01:00
Christian Stenger
e26ab8993e Squish: Added debugging output 
Change-Id: I8f838a61261e1355031b7206a73c013cdcbda5a3
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-10 08:47:13 +01:00
Robert Loehning
e75a9010b0 Squish: Updates for changed project wizards 
Change-Id: I70801de29312bb49db060d0b87fc9dcb1490c6ca
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-09 18:42:35 +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
354bcaa893 Squish: Updated openQmakeProject() 
Change-Id: I8594161b99c207852be290cc8212aefe6faef609
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-02-06 16:30:51 +01:00
Christian Stenger
dfafc2321f Squish: Small fix for selectFromFileDialog 
If there are more than 1 folder starting with the
given path it still fails for me - it switches
into the parent folder and that's it. Adding the
separator char works fine again.

Change-Id: I49a9aaf3f68c09d8db803ce9b1e5222a8faeaf7b
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-06 15:31:20 +01:00
Robert Loehning
0286148a14 Squish: Fix using file dialogs 
Because of the proposals the file dialog makes
when typing into the line edit selectFromFileDialog()
seems to fail sometimes (in Jenkins and on my machine).

Change-Id: Iea098016075e9a8471bd85f585e473fa8dd3bf6a
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-02-03 16:24:21 +01:00
Robert Loehning
1b6a3addcd Squish: Limited number of rows for task file to 100 
Change-Id: I05255b3d06cf08fa2e2744105aa88c8510b0f6ef
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-02-03 14:56:43 +01:00
Robert Loehning
7dbc6014e3 Squish: Added test for command line output 
Change-Id: I4a25f971d41acd5e349e753602d4ae3aaafb4e32
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-31 16:37:31 +01:00
Robert Loehning
2f27c73c8e Squish: Added warning about unusable targets 
Change-Id: I2796aaf40d0ffcf89aca085afdc685f57e1b4f76
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-30 17:48:56 +01:00
Denis Mingulov
142cee902b TextEditor: Fix incorrect dependency to CppEditor resources 
TextEditor BaseHoverHandler::addF1ToToolTip() method has used
a resource from CppEditor (:/cppeditor/images/f1.png), despite
of the inverse official dependecy in PluginSpec file and other
classes.

As it is not used anywhere else - to fix the issue f1.png and
f1.svg are moved from CppEditor to TextEditor.

Change-Id: I14b542837d6337bd08e19ad72cf4a869be08465a
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2012-01-30 14:06:23 +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
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