Commit Graph

499 Commits

Author SHA1 Message Date
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
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
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
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
3c350c93d8 Squish: Small refactoring - renamed helper
Change-Id: I3ca9261043f568a9e160546998dd7b2cd5aa0dd4
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2011-11-02 09:41:53 +01:00
Robert Loehning
edad3217e6 Squish: Added function which selects template for new project
Change-Id: I7858e60c21641e39f6a5c23a12e3fd78a9d17334
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-11-01 14:48:55 +01:00
Robert Loehning
8cf0d1c608 Squish: Avoid timing issues when using Locator
Change-Id: If768a758f3887607c9ef46939dc22685cf54fb45
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-11-01 13:56:22 +01:00
Robert Loehning
08115952ea Squish: Added function handling name and location of new projects
Change-Id: I23af07bb41b517af1ad9f65c642c3eedd0712093
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-10-31 17:58:06 +01:00
Robert Loehning
e711c1ad5a Squish: Use isinstance() instead of comparing classnames
Change-Id: Ia0683902e96f1dc175978bdbb13fbd114f6ad739
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-10-18 10:40:27 +02: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
Robert Loehning
584a8f016e Squish: Moved remaining functions for creating projects to project.py
Change-Id: I92b56ed9401be41d0a54dd32c623b55b7d1e4f71
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-10-13 14:58:04 +02:00
Christian Stenger
2c155447be Squish: Fixed some minor problems
* problems on shutdown (mostly Win)
 * timing problems (Mac, Win)
 * support for accidental whitespace in settingspath (all)
 * added support for further special characters that could exist
   inside TreeView of the Project files (all)
 * removing the testing folder instead its content (all)

Change-Id: I146b56d253e3245641d0dcaebfad4d6f1dd684fc
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2011-10-12 14:21:45 +02:00
Robert Loehning
23436285bc Squish: Renamed "destination" to "target"
Change-Id: I8f8a1cc4b58642fc64adfa76eea84c2b4e9f0423
Reviewed-on: http://codereview.qt-project.org/6255
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-10-10 15:42:17 +02:00
Robert Loehning
dbf48009cc Squish: Don't add temporary files to git
Change-Id: Ia076166a867c1c1a9031ea6515143876f4a73d34
Reviewed-on: http://codereview.qt-project.org/6263
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-10-10 13:17:39 +02:00
Robert Loehning
cc1a2d15d1 Squish: Merged variations of createNewQtQuickApplication()
Change-Id: I5c2f88e18630922a34dbb52894ce6ef26697c28b
Reviewed-on: http://codereview.qt-project.org/6180
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-10-07 15:17:38 +02:00
Robert Loehning
368726d6f2 Squish: Moved contents of mainwin.py to other files
Change-Id: I998b1304dc9ad8832990da5e90ab426c38eb329e
Reviewed-on: http://codereview.qt-project.org/6182
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-10-07 13:24:45 +02:00
Robert Loehning
97207cf28c Squish: Improved function checkCompile()
Change-Id: Ib1b0dada442dc58f1e56343cf4ae602650291fcf
Reviewed-on: http://codereview.qt-project.org/6167
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-10-06 17:43:20 +02:00
Christian Stenger
8a857ecc29 Squish: Updated existing tests to run on Mac
Change-Id: Id4c3bd97f806e502fe64ca9bd4864938d918dc73
Reviewed-on: http://codereview.qt-project.org/6156
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2011-10-06 15:07:17 +02:00
Robert Loehning
dc5e5765d9 Squish: Button was renamed to "Issues"
(cherry picked from commit 2e968aa998)

Change-Id: Ib0ce148edc46a663622d9437da3b7b977baad716
Reviewed-on: http://codereview.qt-project.org/6153
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-10-06 14:13:50 +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
Robert Loehning
c3a294a1b0 Squish: Added constant defaultQtVersion
Change-Id: I72bf98000af9a46c8773d01233ba9e6006f527e6
Reviewed-on: http://codereview.qt-project.org/5643
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-09-28 16:21:11 +02:00
Christian Stenger
92e4bec731 Squish: Remove also versioned .user files
Change-Id: Icf4325930f5e1bd908fef9cbd87658b4cc8fc110
Reviewed-on: http://codereview.qt-project.org/5601
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
2011-09-27 14:03:06 +02:00
Christian Stenger
49a5f8be1a Squish: Some smaller refactorings
Change-Id: I5f8b5ec982e8a38d32ba15d81317c2308dc00106
Reviewed-on: http://codereview.qt-project.org/5544
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2011-09-27 11:18:33 +02:00
Robert Loehning
692806bb8f Squish: Starting test cases only if needed files are present
Change-Id: I41a73ce1a4f0d0578cf59af5c69fc19f9ec11dd9
Reviewed-on: http://codereview.qt-project.org/5555
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-09-27 11:15:29 +02:00
Robert Loehning
5daf6705ac Squish: Using native directory separators on Windows
Change-Id: I8ecf6a8798526b9d9dd0909b9c7e4f61d00d530e
Reviewed-on: http://codereview.qt-project.org/5552
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-09-26 17:08:58 +02:00
Robert Loehning
08dfd0d08a Squish: Improved path constants
Renamed the old constant SDKPath to srcPath because this is where sources are.
Added new constant sdkPath for the root directory of the Qt SDK installation.

Change-Id: I1b1f346554f58629a9d1882f90250f21708e4d22
Reviewed-on: http://codereview.qt-project.org/5474
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-09-26 12:22:07 +02:00
Christian Stenger
11f7dbda77 Added new qml test and continue refactoring
Refactoring of all helper functions to make it easier to
recognize them as such. All helper functions in global
shared scripts now follow the scheme __NAME__
Helper functions normally should not get called from outside.

Change-Id: I0d02028d3f9de1ad251af9226c0460655bd9c9bd
Reviewed-on: http://codereview.qt-project.org/5331
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
2011-09-22 16:31:34 +02:00
Bill King
106473c4b5 Cleanup to use new waitForSignal function.
Change-Id: Id47c81fc3c2d4448f26dd2432b73286501be1e26
Reviewed-on: http://codereview.qt-project.org/5297
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-09-21 14:01:41 +02:00
Bill King
226a11db6f More sensible options (with fallback)
Change-Id: I32afb2ed7e690d3dfc9b2ba47d2007d03d29d2cb
Reviewed-on: http://codereview.qt-project.org/5299
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-09-21 13:45:09 +02:00
Bill King
c42351beda Shift temp dir into more findable location.
Change-Id: Idbf29e79d4a3dc7c4083a5b7cba78489db46366b
Reviewed-on: http://codereview.qt-project.org/5298
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-09-21 13:44:41 +02:00
Christian Stenger
c36e017d40 Added indentation test for Qml
Change-Id: I15751d93dccba232455e6e85c4ac0c30c74be3af
Reviewed-on: http://codereview.qt-project.org/4650
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
2011-09-12 12:44:59 +02:00
Bill King
509eb894dd New waitForSignal function
...and real life test case.

Change-Id: Id22f4a7bf444e319651b54e1a3a230040b982e30
Reviewed-on: http://codereview.qt-project.org/4548
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-09-12 10:35:26 +02:00
Christian Stenger
e137af3a42 Added test for creation of QtQuick application
Added more QtQuick tests and did some refactorings according to re-appearing code.
Completed the Qt Quick Wizards test from QtCreatorTestingMatrix.

Change-Id: I857d9f3c3809221e2df3e096b3926a8d5d36b828
Reviewed-on: http://codereview.qt-project.org/4238
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
2011-09-08 10:51:17 +02:00
Christian Stenger
46320d6417 Improved writing tasks files
Change-Id: Ia7dfa0c4554082e8620cfbed40e3f105fb8ff2e1
Reviewed-on: http://codereview.qt.nokia.com/4205
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
2011-09-05 16:28:02 +02:00
Christian Stenger
2d6842e62d Improved build handling when build fails without errors inside build issues
Change-Id: I0958a9a8e644c245fb0930f5d165e0aac4a74ce8
Reviewed-on: http://codereview.qt.nokia.com/4184
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
2011-09-05 13:48:13 +02:00
Bill King
eac89e401d Fix openQmakeProject to match new combo value.
Change-Id: Ice0050bf1bb7af59eb57c1e9218d96b3114f4c08
Reviewed-on: http://codereview.qt.nokia.com/4129
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-09-05 10:21:02 +02:00
Christian Stenger
d5e57c12c8 Added function to read out build issues
Change-Id: I1300fd9b7f136fa747f8f0063e232a2803548963
Reviewed-on: http://codereview.qt.nokia.com/4072
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
2011-09-02 09:46:43 +02:00
Christian Stenger
991e19b40b Refactoring build functions, enhancing signal handlers
Added functionality to remove the need to clean settings by yourself

Change-Id: If2d95618d5e77e30480d0ca763ad7ce632f2d094
Reviewed-on: http://codereview.qt.nokia.com/3984
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
2011-08-31 16:37:00 +02:00
Bill King
507d260bd4 Fixes openProject, also tests multiple target selection and building.
Change-Id: I4a5aaea2eca940c3ffcf8458b5cc0afce591b63e
Reviewed-on: http://codereview.qt.nokia.com/3886
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-08-31 14:09:38 +02:00
Bill King
f4ba61528e Remove the need to set global scripts directory.
Change-Id: I8f937120f7b151b0c68480a898fd953ae542bf69
Reviewed-on: http://codereview.qt.nokia.com/3662
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-08-29 12:36:31 +02:00
Christian Stenger
648e985cd6 Improved check for last build status
Change-Id: I18f8839daeb5f21957b9ab8102341f25dd77720d
Reviewed-on: http://codereview.qt.nokia.com/3651
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
2011-08-26 12:21:20 +02:00
Bill King
756fb87983 Initial commit of squish tests for creator.
Change-Id: Ic499b3c36d37f9789276f60a41642ffc7ee816d1
Reviewed-on: http://codereview.qt.nokia.com/3047
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
2011-08-26 09:46:31 +02:00