feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,929 Commits 108 Branches 368 Tags
3b901b25a86f49ebef9be03ec762ed76422fd91c
Commit Graph

562 Commits

Author SHA1 Message Date
Christian Stenger
d77d0ae504 Squish: Fix for UI change 
Change-Id: Ida522c026c41c8cd5bd29b9cca3bb6b9334c84c4
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-06-12 09:35:09 +02:00
Eike Ziller
1ccde24c77 Merge remote-tracking branch 'origin/2.5' 2012-06-11 16:39:38 +02:00
Robert Loehning
5d01b60d56 Squish: Avoid warning about missing Harmattan target in APTW01 
Change-Id: Ibeb0477a8283d229888c4744beecfc6bd8252f3c
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-06-05 11:01:00 +02:00
Robert Loehning
2dcec0cac4 Squish: Updated check for new, more detailed warning 
Change-Id: I55b470db573aaca679df9cb1e89511b858683214
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-06-04 16:39:42 +02:00
Eike Ziller
b7c34292f4 Merge remote-tracking branch 'origin/2.5' 
Conflicts:
	tests/system/objects.map

Change-Id: Ie6aed14f2f61111d26498ff3684ea4a57e6da59e
 2012-06-01 14:06:24 +02:00
Jan Kerekes
20afae749d Squish: Added new test cases/suite for project templates 
initial commit

Change-Id: I0000bc8d3d0304ac37b135ea7b9c893b1054c958
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-05-31 13:22:37 +02:00
Robert Loehning
23fcc1a823 Squish: Small improvements 
Hoping to fix some fails on Mac

Change-Id: I5e9f47f0714b14a6b87df342de74e7fd41fe94b0
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-05-31 11:14:27 +02:00
Robert Loehning
9e1de91d7d Squish: Update for changed Options dialog 
Change-Id: I680ef0307837abae3edc813991acbed5fb31ccce
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-05-30 18:18:32 +02:00
Eike Ziller
b97dd0e7c8 Merge remote-tracking branch 'origin/2.5' 2012-05-25 13:21:25 +02:00
Robert Loehning
ea63b86e49 Squish: Replaced function moveTextCursor 
Change-Id: Ie4cccd0de668690a3d66baf422bcfff7acae7345
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-05-25 13:11:17 +02:00
Robert Loehning
53fb9d4ae8 Squish: Simplified placeCursorToLine 
Change-Id: Ib56bc7b2596ac61233e147fb62f763a594abe9df
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-05-23 17:16:19 +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
Eike Ziller
acd387c37b Merge remote-tracking branch 'origin/2.5' 
Conflicts:
	qtcreator.pri
	qtcreator.qbp

Change-Id: Iacfb9cc0c927c9d6291c60624f9e6fd2ce5877cb
 2012-05-15 11:10:42 +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
Eike Ziller
0a0de08efb Merge remote-tracking branch 'origin/2.5' 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/plugins/find/treeviewfind.cpp

Change-Id: Iaae61c98938df24bda5521a923303db89eb7f8fe
 2012-05-10 08:14:36 +02:00
Robert Loehning
751386b372 Squish: Increased timeout when waiting for Continue_QToolButton 
Change-Id: I4f1701a49c2a4174df1cf22e4375f2447b11e92c
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-05-08 17:22:10 +02:00
Robert Loehning
b1fd62e04b Squish: Update for changed breakPointTreeView 
Change-Id: I861585b895f3c3ea0d4ffc324c631e508899f79e
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-05-08 12:13:03 +02:00
Eike Ziller
529c0a8fe2 Merge remote-tracking branch 'origin/2.5' 2012-05-07 15:18:39 +02:00
Christian Stenger
b63135c067 Squish: Fix possible access to None 
Change-Id: I4c4a0f211169dad48a4a6b78e4c298b986d07158
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-05-07 14:55:14 +02:00
Eike Ziller
c41a332fc2 Merge remote-tracking branch 'origin/2.5' 2012-05-02 10:56:23 +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
Eike Ziller
71d9f33bef Merge remote-tracking branch 'origin/2.5' 2012-04-26 07:06:04 +02:00
Jan Kerekes
98c926f7e5 Added new test cases/suite for QML support 
initial commit

Change-Id: Ifff6a8f9f6b74e099a906fafeb7db2c74aa3bc6f
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-04-24 15:36:17 +02:00
Oswald Buddenhagen
822233629d Merge remote-tracking branch 'origin/2.5' 
Conflicts:
	qtcreator.pri
	src/libs/utils/utils.qbs
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmljseditor/qmljseditor.qbs
	src/plugins/qmljsinspector/qmljsinspector.qbs

Change-Id: Ib239d50c21cb06d3a8e821e03dc093552f40ffab
 2012-04-19 16:13:09 +02:00
Christian Stenger
13b8e587a6 Squish: New helper functions for debug test 
Change-Id: I606bc1c98d807548a481a69f8bdc25577a0e54d8
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-17 09:22:22 +02:00
Oswald Buddenhagen
6b8167c663 Merge remote-tracking branch 'origin/2.5' 2012-04-16 10:03:48 +02:00
Jan Kerekes
9d263a1b34 Added new test cases/suite for c support 
initial commit

Change-Id: I8eb36efa0e7e577597708d97a2efe52c07801f02
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-13 11:10:58 +02:00
Christian Stenger
146b1672d2 Squish: Handle None in __cropAndLog__() 
Change-Id: Ie2bbcfde7684f0d25ed8ff7e7da2897a9f1a0873
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-10 14:58:18 +02:00
Christian Stenger
88eec5ae47 Squish: Use sorted filenames also for Console 
Change-Id: I8ac973e772b3d1856e5307319c75fb4d150cf818
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-10 13:54:43 +02:00
Christian Stenger
fb85d0a0f2 Squish: Handle Update Generated Files on Mac 
Change-Id: I390ba57266ab983335a5d76d38a025b4306c5b74
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-05 20:05:54 +02:00
Christian Stenger
158dfffe7d Squish: Add try/except to continue anyway 
Change-Id: I24a51142988841da3aa156f6a5e6e239a6bd1914
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-05 19:51:59 +02:00
Eike Ziller
9ec6e9f7e0 Merge remote-tracking branch 'origin/2.5' 2012-04-05 18:24:26 +02:00
Robert Loehning
f521c9f062 Squish: Always use the same function for preparing templates 
Change-Id: I90dac33dde4c0c3d39c8e8038371dfbb3403dce3
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-04-05 17:22:06 +02:00
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