Commit Graph

562 Commits

Author SHA1 Message Date
Robert Loehning
abd62116f8 Squish: Removed unneeded workaround
Change-Id: I38fc9742fa4b26a694d8bcaddabaf0ceddb48d7c
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-03-08 16:04:43 +01:00
Christian Stenger
933592e6a7 Squish: Add debug output on fail
Change-Id: I6ccf33aca23a819ef19ac148b27e36d40854b4cb
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-03-08 09:01:53 +01:00
Eike Ziller
4b8df15f3d Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/plugins/remotelinux/startgdbserverdialog.cpp

Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
2012-03-08 07:48:55 +01:00
Christian Stenger
3a808b0fd8 Squish: Proxy handling to avoid Jenkins fatals
Change-Id: I89f13b9cf8887168291a29a30288affb1b46dd11
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-03-07 16:43:42 +01:00
Robert Loehning
c283323afd Squish: Fixed searching for external tools
Change-Id: Iad16f3e7a7a4c886bcd2b7eb9bf94ded9926d37f
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-03-05 17:58:15 +01:00
Christian Stenger
b3e9343c1d Squish: Added time saver
This avoids fetching the status and resolution again
and again for a test case.

Change-Id: I9445d329eb127830352add23e8ff0b5e2b9adbe6
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-03-05 09:09:34 +01:00
Robert Loehning
3aaa3b3fa4 Squish: Fixed handling of targets
Done-with: Christian Stenger

Change-Id: Iaa03a3df2151706bbe5d508a20f70a5007817d4d
Reviewed-by: Bill King <bill.king@nokia.com>
2012-02-29 13:28:09 +01:00
Robert Loehning
f92b8486af Squish: Working around QTCREATORBUG-7002
Change-Id: If575398e4ea9f7dcd4b31ebdf49708f2b2dcbc15
Reviewed-by: Bill King <bill.king@nokia.com>
2012-02-28 14:35:38 +01:00
Christian Stenger
25decf2052 Squish: Fixing Mac
* removed unused object
* refactored invokeMenuItem()
* always lookup cppwindow to avoid failing type()
* use objects stored inside objects.map to avoid LookupError
* reverted raising timeout to 60s
* added workaround for missing focus on Mac right after
  startApplication()
* removed the need to have a shell-script called 'qtcreator'
  (make sure to add 'Qt Creator.app' as AUT now)

Change-Id: I21511d810deedf31dfb19b896edd21b79e73b755
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-02-28 14:33:19 +01:00
Bill King
2c7e68e6f7 Handle situation where applications are in C:\Program Files
Change-Id: I9d99aac111ae2d630bfb21d4ce39df2d184709f2
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-02-27 22:00:43 +01:00
Christian Stenger
e1970f1823 Squish: Add workaround for QTCREATORBUG-6994
Change-Id: I8077f50a1359db9044a0b0c607e3cc94e7f1f042
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-02-23 16:42:05 +01:00
Christian Stenger
a6f9035396 Squish: Clean up (Bug 6967 is closed)
Task-number: QTCREATORBUG-6967

Change-Id: I460110bbad5a400aef474f837fe29c2821594fd5
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-02-23 14:15:18 +01:00
Christian Stenger
b809e805aa Squish: Fix trailing whitespace
Additionally pushing Cancel instead of OK when
leaving Options dialog (we don't change anything).

Change-Id: I67ff5a891dc3a038822ff42e798981f00d633e80
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
2012-02-23 14:01:22 +01:00
Christian Stenger
696dd9a70d Squish: Added small debugging output
Change-Id: Ia31afc253bad05c3143c8704c95b41cc949e13f2
Reviewed-by: Bill King <bill.king@nokia.com>
2012-02-23 11:44:35 +01: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
3ad7e50827 Squish: Verify targets for project creation
Change-Id: I3af0e0cde985c4b04bd4ae8181c3b82cda22b2b8
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-02-22 13:57:47 +01:00
Christian Stenger
5485d15982 Squish: Reverted unsuccessful try, raised timeout
Change-Id: I1ce57c671eab1ff2084724b7799867326cd7ed24
Reviewed-by: Bill King <bill.king@nokia.com>
2012-02-21 14:50:07 +01:00
Robert Loehning
d3ad49ea4d Squish: Excluding Maemo target from Qt Quick projects
Change-Id: Ief66b17723d867711bd9eb4a9fa549e930efd7f9
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
2012-02-21 13:58:25 +01:00
Christian Stenger
a1c504e8cf Squish: Try to make 64bit pass on Jenkins
Change-Id: Id829958f434ed96569ac3278271a2d2caf78d674
Reviewed-by: Bill King <bill.king@nokia.com>
2012-02-21 12:20:09 +01:00
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
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
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
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
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
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