Commit Graph

28 Commits

Author SHA1 Message Date
Eike Ziller
021b64b5df Merge remote-tracking branch 'origin/2.6' 2012-10-22 11:17:09 +02:00
Robert Loehning
9687e18820 Squish: Removed outdated cleanups
__removeTmpSettingsDir__() does it all.

Change-Id: Ic1eb2ef02665c5d863956a1587f4f46344743f8e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-10-18 16:26:28 +02:00
Eike Ziller
d5d1c5e394 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
2012-10-09 11:50:17 +02:00
Christian Stenger
38e27f8056 Squish: Fix checkDebuggingLibrary()
Additionally:
* extracted iterateKits() for better re-use
* added parameter to iterateQtVersions() for easier usage
  when using iterateKits() as well

Change-Id: I8bec8ca8e1e37a233c121dbcfbf1c89104f79a7d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-10-09 10:03:22 +02:00
Eike Ziller
a55d47544a Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.qbp
	src/plugins/qtsupport/baseqtversion.cpp
	src/tools/tools.pro

Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
2012-09-26 10:01:04 +02:00
Robert Loehning
e51863ee1a Squish: More explicit name for Desktop kit
Change-Id: Ibc711e37ca71d3543a8fa8b46fb2ac7c9c5c4129
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-09-25 14:11:12 +02:00
Robert Loehning
b99fd060e1 Squish: Updated tst_simple_debug
Change-Id: Ida1508c5e2f15a3fc79066d5133b91c0f9e3affa
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-09-13 13:57:54 +02:00
Christian Stenger
bd43956bbd Squish: Use global objects.map from inside CCOM
Change-Id: Icc22f595f6c5c9472755e1134b7663dde7bccb86
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-06 09:42:38 +02:00
Christian Stenger
2cd6db04bf Squish: Fix breakpoint line number
Generated main.qml has changed.

Change-Id: I697e9346e2fc45f5c5423b2f9d9892a601a38c75
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-24 09:37:58 +02:00
Robert Loehning
bef8f58fe8 Squish: Updated calls to iterateBuildConfigs
Change-Id: Idca2d311399194b455e211fb72d1fcf810cbb624
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-07-24 13:55:33 +02:00
Robert Loehning
0853fa077b Squish: Added tst_simple_debug to suite_debugger
Change-Id: I2b13562e774780b0ccb15decdd84f32a08e1f60a
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-06-04 13:14:33 +02:00
Robert Loehning
a71b768675 Squish: Added fatals when no Qt version was found
Change-Id: I1d1f4f378ef60107a488477bce40dacaabbe4109
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-05-21 17:12:39 +02:00
Christian Stenger
525cf2353e Squish: Support more than one breakpoint per file
Change-Id: Ic33e039fe5aea9caed5a3e992a74938e331e2a4b
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-05-16 18:31:13 +02:00
Robert Loehning
49a3f0129a Squish: Run tst_simple_debug with Qt 4.7
Change-Id: Ibc330a7ca3e1c378c78cf8eb4c559c2a99c3d8d0
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-05-11 21:15:51 +02:00
Christian Stenger
aa3a2dc926 Squish: Added debug test case
This is intended to be a starting point.

Change-Id: I0941ed16876810832aa6088287f8062bba6a273e
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-04-27 17:52:25 +02:00
Christian Stenger
c4e5dcb770 Squish: Change temporarily(?) to Console
Change-Id: Ib31780a5cc4a159afb4f3eeef4165d30f09e2ba7
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-04-05 20:13:00 +02:00
Robert Loehning
791a196f1d Squish: Always using menu to close Creator
Change-Id: I9f8019a23ad96baa865c74721fb8712d612adb81
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-04-04 13:14:43 +02:00
Robert Loehning
08f9d72c51 Squish: Skipping unstable test on Mac
Change-Id: Icf8e78487d2e734c79aa2b93401a911769a9545e
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
2012-03-06 11:02:16 +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
Robert Loehning
873b0805a0 Squish: Raising timeout
Hoping to stabilize this on Mac.

Change-Id: Iaac5891076166130071ce5ca59a5a89402e6017a
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-02-23 18:41:00 +01:00
Christian Stenger
4667371b9a Squish: Add timeout for cli test
Change-Id: Id7a8a01d48cd78e98edad9885ecb41360e62e649
Reviewed-by: Bill King <bill.king@nokia.com>
2012-02-21 12:46:50 +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
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
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
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
Robert Loehning
1139006b3f Squish: Let one function handle last page of all project wizards
Change-Id: I74e2c2f0c50a3131ad66fbde5e4a7fe004b7ebff
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-10-17 18:09:25 +02:00
Christian Stenger
457bc75a85 Squish: Changed bad naming and property issue
Change-Id: I797820642f9f7041801930155dad2fc708e90ea0
Reviewed-on: http://codereview.qt-project.org/6177
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2011-10-06 19:55:40 +02:00
Robert Loehning
61714ec4c9 Squish: Added test suite for debugger related tests
Change-Id: I11c114787cc3c2721147d55c86f87aaf31daec9e
Reviewed-on: http://codereview.qt-project.org/5644
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-10-05 13:54:09 +02:00