feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
80,529 Commits 108 Branches 368 Tags
5e059db065b1680c4f08b901b64f102300eda6e6
Commit Graph

779 Commits

Author SHA1 Message Date
Eike Ziller
c814538d95 Merge remote-tracking branch 'origin/2.5' 2012-04-04 16:20:10 +02:00
Jan Kerekes
2ece74469c Added new test cases/suite for complex project compilation 
initial commit

Change-Id: Iefa2e05b4dcd70d599bbf4c7de1ae230cd8f0450
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-04-04 10:28:23 +02:00
Eike Ziller
078d570721 Merge remote-tracking branch 'origin/2.5' 
Conflicts:
	share/share.qbs

Change-Id: Ia64573d1a69b9063fee32496a3f0a00926a3dadd
 2012-04-03 10:03:52 +02:00
Christian Stenger
a96cbcf335 Squish: Small fixes for utils.py 
* invokeMenuItem(): changed order and additional
  waitFor to be more error-proof on Mac
* logApplicationOutput(): added try/except block
  for cases where no former run/debug could be found

Change-Id: I0d434fbb964e3d85e5ccb2a4c336e14e956f44ce
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-02 18:10:46 +02:00
Jan Kerekes
5254e3e547 Added new test cases/suite for simple project compilation 
initial commit

Change-Id: I06d211ba9878852839cd4774b930efd8cde244ae
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-02 15:38:21 +02:00
Christian Stenger
7e4e06796e Squish: Small fixes for runAndCloseApp() 
Change-Id: I74136202c2d5e482a18a56ea2c0ba11d9d958574
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-02 15:30:03 +02:00
Christian Stenger
f3fd47f601 Squish: Introduce new helper function 
Change-Id: I6ef3022e7053c1e4993cc4276ccd2502de196754
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-03-30 18:20:04 +02:00
Robert Loehning
042dae0e5e Squish: Waiting for enabled button 
Change-Id: If06bb6360c7837e773e2eb0b6be8143e588b771e
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-03-30 14:55:03 +02:00
Eike Ziller
8f6d915948 Merge remote-tracking branch 'origin/2.5' 2012-03-28 16:31:29 +02:00
Christian Stenger
857261f99d Squish: Improve openQmakeProject() 
Change-Id: I847604f81d1bdb10a56360af3d0969e451b3344c
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-03-28 15:27:38 +02:00
Robert Loehning
f3bb330ea0 Squish: Further improvement of switchViewTo() 
Change-Id: I25f857f05120882427a8ba7569a4c1b66c474f5e
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-03-27 16:28:19 +02:00
Robert Loehning
ae070f3277 Squish: Fixed issues in switchViewTo() 
Change-Id: I693ad1bf30c8644f07bd4188178cb96d374a3ea1
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-03-26 18:37:37 +02:00
Oswald Buddenhagen
51988bb5e0 Merge remote-tracking branch 'origin/2.5' 2012-03-23 17:50:29 +01:00
Christian Stenger
cd4ce50a3b Squish: Fix changed values 
These values have changed (see src/plugins/projectexplorer/taskmodel.h)

Change-Id: I7b351cfae2bceca782ea022b855d86926e942d53
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-03-23 16:53:10 +01:00
Robert Loehning
79b0ff8186 Squish: Updated checking for created files 
Done-with: Christian Stenger

Change-Id: I533ff2f41a5d6554d0f6a880d1ede093de2f9d6c
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-03-09 17:42:46 +01:00
Oswald Buddenhagen
a5063e6ba4 Merge remote-tracking branch 'origin/2.5' 
needed due to QA-related changes.

Change-Id: Ie29699fa9dc494dc3849175ccf9523377efcb1e9
 2012-03-08 16:29:05 +01:00
Robert Loehning
0949e7528b Squish: String updates 
Change-Id: Ic513a4cd10460d177b0305e53a4ed55b7c75e541
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-03-08 16:04:56 +01:00
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