feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
24,819 Commits 108 Branches 368 Tags
bb66e5462682b8e9c5a334476db3dc44632c9723
Commit Graph

230 Commits

Author SHA1 Message Date
Christian Stenger
7184fabfc7 Squish: Fix openQmakeProject() 
This fixes openQmakeProject(). There's still more
to do (e.g. selecting Release/Debug) what will be
done in later patch(es).

Change-Id: I34ebf793c89b2d2ddf1f97c7eed6c6eb6c7f5bcb
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-07-13 17:10:17 +02:00
Robert Loehning
1d27304628 Squish: Added Desktop target 
Change-Id: I3b44bb1083fbfb6624bed4226ab752f6bd81f79f
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-07-12 16:53:46 +02:00
Robert Loehning
06cad70310 Squish: Updated __selectQtVersionDesktop__ 
Change-Id: I45b870c9f0def59f11196c98a446a506ce672049
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-07-12 16:53:25 +02:00
Bill King
a8debd265f Fix to handle situation where Harmattan isn't found in list of targets. 
Change-Id: I7de9e62f756f0c8ea8858853d59bf3743e053ab0
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-07-03 14:30:22 +02:00
Robert Loehning
f9b8ae6a33 Squish: Moved and updated qtversion.xml 
Change-Id: I2e15c2926c1079e21370663210e91fe144d8ef02
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-06-29 17:41:04 +02:00
Robert Loehning
0db4c917f4 Squish: Fixed HELP06 for master 
Change-Id: Ic2e4f49502764e8835341c0d712c6c418d7259a5
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-06-26 15:27:21 +02:00
Eike Ziller
6e2db0b66e Merge remote-tracking branch 'origin/2.5' 2012-06-20 14:52:30 +02:00
Robert Loehning
79ca1f3d7c Squish: Fixed missing suffixes in getEditorForFileSuffix 
Change-Id: Iabda661a70a7656003b47aaf91de28c213d076dc
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-06-20 12:41:03 +02:00
Jan Kerekes
f22449b94a Squish: Added new test cases(4, 5) to c support suite 
initial commit

Change-Id: If2fb169ac66ccbcc463e4cfef491ca4fb3e01c30
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-06-19 17:32:39 +02:00
Christian Stenger
eeb7ecbb40 Squish: Fix for UI change 
Additionally changed waiting for TargetSelector
from 20s to only 5s.

Change-Id: I2e342faa6f87b86335bb01f28832ad9c01a27ffb
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-06-18 20:13:58 +02:00
Christian Stenger
89aaa96031 Squish: Fix project.py 
* add Desktop as available target in __chooseTargets__()
* do shadow builds for Desktop targets in openQmakeProject()

This patch makes https://codereview.qt-project.org/#change,28038
pass for me on Linux as well.

Change-Id: I3a4395a401198756e6a7d6a38c0b024167088dc3
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-06-18 19:49:46 +02:00
Robert Loehning
56c7facc68 Squish: Testing GLSLEditor in tst_select_all 
Change-Id: Ib1d16d7cb7fe108b23c9eca70da6b6de2f9c563a
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-06-18 19:49:04 +02:00
Jan Kerekes
23c7665cc5 Squish: Added new test cases/suite for help functionality 
initial commit

Change-Id: I20aae999dec164a29e40c2926e36c015526c17cd
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-06-12 19:00:24 +02:00
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
Robert Loehning
046f42b282 Squish: Removed unused code and data 
Change-Id: I20df2aa148002ecb9b1526df125daf04bc76010e
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-06-04 14:58: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
356d5cab23 Squish: Removed unused object 
Change-Id: Ic1122d693e14084fc076c34ece5e2e8d402321ed
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-06-01 14:15:01 +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
Robert Loehning
9499fef826 Squish: Removed unused objects 
Change-Id: Icded1d58ff0b59e0f29add19e44d2ede7592a16e
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-06-01 13:54:55 +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
Robert Loehning
254812a7b5 Squish: Removed system Qt 
Change-Id: Ib9bbe99489c0de6be0c8571deb83c72bf76a2779
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-05-30 17:08:36 +02:00
Robert Loehning
9ac204bdfb Squish: Updated text of "Stop Debugger" button 
Change-Id: Ie0ebd4812ee679ed2a8e1cdae2f9399ae19f2528
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-05-30 11:33:27 +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
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
d14fdf2c4c Squish: Updated suite_QMLS for changed GUI. 
Change-Id: Ie67def5b38126eea57f0f3d8e26b3f8844cdfb37
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-05-16 18:24:52 +02:00
Eike Ziller
e7aded981a Merge remote-tracking branch 'origin/2.5' 2012-05-16 15:01:07 +02:00
Jan Kerekes
ac430542ae Added new test cases (QMLS06, QMLS07, QMLS08) to QMLS suite 
initial commit

Change-Id: I3be474d8def1161e60421030a799e297e21fc4fe
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-05-15 13:18:53 +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
Jan Kerekes
7b51bfc845 Refactoring of QMLS suites 
- moved common parts to shared script

Change-Id: I25ac888d7103ee36edff9ead502fa432a5dc2937
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-05-11 18:12:00 +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
Christian Stenger
5d92a73c82 Squish: Fix syntax errors 
Change-Id: I61572a8369721ba4943f11f0edee236bd816e771
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-05-09 19:24:55 +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
3b4c6c0332 Squish: Updated object map for changed "Move Component" dialog 
Change-Id: I63ef64848ff48fd83f7f3f82fc0f088b67147847
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-05-08 13:05: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
Robert Loehning
af6da38d5b Squish: Marked Qt versions as not autodetected 
Change-Id: I073dcc886dd7b05d702eb0968a776d5815f4001d
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-05-07 18:18:17 +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
Robert Loehning
de22e66e21 Suiqsh: Update for changed Menu 
Change-Id: I3072dd21ed660d6e5cbe5a2bd2e37c3091e4eb79
Reviewed-by: Jan Kerekes <jan.kerekes@ixonos.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-05-07 10:03:56 +02:00
Jan Kerekes
9186d1ac57 Added new test cases (QMLS03, QMLS04, QMLS05) for QMLS suite 
initial commit

Change-Id: I955f7ca471541d4fb9c8505eb041b433cbff8b84
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-05-02 18:30:52 +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