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

1195 Commits

Author SHA1 Message Date
Eike Ziller
44931c0985 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
 2013-04-18 09:22:19 +02:00
Robert Loehning
3fd74568b8 Squish: Updated checkLastBuild() 
Change-Id: Iebe27d2d4d08fde62398cd711ad557f16a6f3974
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-17 15:18:48 +02:00
Robert Loehning
0a79a50d06 Squish: Fix cleanup gone wrong 
Change-Id: Iebd03914a2abcfa014288f82360687f18d6bacd9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-12 18:14:34 +02:00
Eike Ziller
9ff8979da3 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/cpptools/cppchecksymbols.h
	src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp

Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
 2013-04-11 18:27:52 +02:00
Christian Stenger
2a261588f4 Squish: Add helper functions to Target class 
Change-Id: Iba67cc28d29346689ca8443ce0b594056feaa0cf
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-10 13:39:10 +02:00
Christian Stenger
c74bb8dfca Squish: Clean up 
Details:
 * removed unused functions
 * removed "QtQuickConstants" (Targets class is used for more than just Qt Quick)
 * removed Components class

Change-Id: I2908348db3e5a627d63242f9524832812822f790
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-10 12:15:29 +02:00
Christian Stenger
ac57bee146 Squish: Fix execution of tst_simple_debug 
Targets checked for debugging libraries now match the targets
selected while creating the project.

Change-Id: Ib5e73254b549a66850da64ffb955531aae6b3477
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-09 16:54:03 +02:00
Eike Ziller
65654e4a50 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/android/androidrunner.cpp
	src/plugins/clearcase/clearcasesync.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	tests/auto/ioutils/ioutils.pro

Change-Id: I31587b8a4dd6aacc1e76803159da51a972878370
 2013-04-08 13:26:37 +02:00
Robert Loehning
f4eddb96ea Squish: Using default installation of Qt5 on Windows 
Change-Id: Ib1ec62fce66487591cadb8c0bec0d378721ebbb0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-05 16:38:12 +02:00
Robert Loehning
970b55b125 Squish: Added Qt5 to default desktop kits 
Change-Id: Iefb0db16224c5b044ea0019be7d2914cc4b4892e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-05 13:54:14 +02:00
Robert Loehning
b8773c9a7d Squish: Prepare tst_simple_analyze for Qt5 
Change-Id: I91caa064e002cc2ab409ec9b1c30ec57c1adb5a9
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-05 13:52:14 +02:00
Robert Loehning
3c24824b0f Squish: Explicitly restricting tst_build_speedcrunch to Qt 4.7 
Change-Id: Ib28f77d1da9573c4124e5db8e7e972bbabf6ac6a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-04 19:37:14 +02:00
Robert Loehning
d3b68556fa Squish: Let iterateBuildConfigs() give information about kit 
Change-Id: I283fbc773c0490c4c9cb5558e9aedfdb94ba5366
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-04 11:30:42 +02:00
Robert Loehning
4319b64c62 Squish: Fixed typo in getQtInformationForBuildSettings() 
Change-Id: Ice68ff84354fa35da7d1217abc3e40acc3783691
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-04 11:30:27 +02:00
Robert Loehning
286240af0e Squish: Removed pointless lines 
Change-Id: I867acd4e00531d6d50553710a00b1cadfc0c3cee
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-04 11:30:15 +02:00
Robert Loehning
f694b04b68 Squish: Replaced duplicate bugreport 
Change-Id: I73bc3a633e47ddd0580976dd355da323e2426b4f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-04 11:30:01 +02:00
Robert Loehning
003821f936 Squish: Prepare tst_CCOM01 for Qt5 
Change-Id: Ic2806673cb65018000bcbe6ae66dad1b2f555e39
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-28 18:57:43 +01:00
Christian Stenger
7f0ff88c61 Squish: Speed up removal of registered documentation 
Change-Id: I0a639ee608b0430a98840406ab14e224d1a64d49
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-28 17:24:29 +01:00
Christian Stenger
a4dda7bc8d Squish: Raise snooze() time when using Mac filedialog 
Change-Id: I92b6a6a449e2df6a2ce92c277d9a1fa326b36606
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-28 15:09:50 +01:00
Eike Ziller
d3c979dc0f Merge remote-tracking branch 'origin/2.7' 2013-03-28 12:19:45 +01:00
Christian Stenger
7c4478c4b9 Squish: Add Mac workaround to tst_revert_changes 
If the editor had not been clicked before invoking the
Edit menu Creator does not notice that the editor has focus,
so all subitems will be grayed out.

Change-Id: If8b23fd6abae1bac6b3387e9a5394cfb4b84529d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-28 09:22:51 +01:00
Christian Stenger
adafc02192 Squish: Fix detection of ABIs on Mac 
Change-Id: If3cca65f1f3ccf7e62dc79cde72d1bce41ab92b9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-28 09:22:43 +01:00
Robert Loehning
d41e01696a Squish: Added Qt 5.0.1 Kit 
Change-Id: Ia5c81254de3bd2ad3537ac3a300aa2dbe0e16015
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-27 17:11:41 +01:00
Christian Stenger
f706d18374 Squish: Fix problem with Mac menubar 
Change-Id: Id03f060acb1ba343cfd1ff9199f3f1de46abd58b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-27 14:29:29 +01:00
Robert Loehning
5aa0f06817 Squish: Make __getMkspecFromQmake__() ready for Qt 5 
Change-Id: I9a2776ad30f718b6d201f738e1f1f158110c1f29
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-27 12:12:19 +01:00
Robert Loehning
bf3ab4f0db Squish: Fix clicking Qt versions 
Change-Id: I8252b2a9a7bfe7b9fe1d1660a15d780f9a0560ea
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-27 12:09:01 +01:00
Christian Stenger
c3ef30796a Squish: Add workaround for Mac issue 
Change-Id: I516afb90001864082fb32678c92215cfd4b79518
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-26 17:24:24 +01:00
Eike Ziller
599be01a67 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
	src/plugins/qmldesigner/components/debugview/debugview.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
	src/plugins/qmldesigner/components/navigator/navigatorview.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
	src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designmodewidget.cpp

Change-Id: I9d8126e88397c02a87b5e4ab4da44e2bc7089134
 2013-03-26 13:09:43 +01:00
Robert Loehning
0bb911f640 Squish: Make selectFromFileDialog() more stable 
Change-Id: Ia454bc3174fa48602e181f4848944c0299a95517
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-25 17:52:46 +01:00
Robert Loehning
d3c94a6c4a Squish: Updated createProject_Qt_Console() 
Change-Id: I7c3efd967f292ce5b132eeba79e51f9aabc54501
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-25 13:56:36 +01:00
Robert Loehning
6f5ce19797 Squish: Added tst_simple_analyze 
Change-Id: I65a6bff6e99ad608639b26452e6700d28e8fbe0a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-22 13:37:14 +01:00
Robert Loehning
3df6756911 Squish: String update 
Change-Id: I67a597021c9af809e852e6cca02c570a5e3764e8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-22 10:32:42 +01:00
Christian Stenger
c11d901e03 Squish: Improve copySettingsToTmpDir() 
Provide ability to omit files while copying the settings as well as
a given destination instead of always using a generated folder.

Change-Id: Ie4a97a90feeff4fd8a8de8b6f0b95a412c17a14c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-21 16:53:48 +01:00
Robert Loehning
5db9e59eca Squish: Warn about handling two different signals 
Change-Id: I6877b0d6d0a1e5e1961e9c8fc054ac096c34c6cb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-20 10:10:08 +01:00
Robert Loehning
a4764ad9ef Squish: Fix tst_create_proj_wizard on Mac 
Change-Id: I0f69e7d34ee4fb1dec2f30e916ff29a33fb5111a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-19 13:58:13 +01:00
Christian Stenger
b2d9290c40 Squish: Fix tst_HELP06 on Mac 
Change-Id: Iaea464d2f76c06566b0c9eeb9bc4572e2e90facc
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-19 13:50:39 +01:00
Christian Stenger
aef3493af2 Squish: Fix using context submenu items for Mac 
Change-Id: I9ab351777f0bae7d15173d0c6cf5eb2f7f719810
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-19 13:23:17 +01:00
Christian Stenger
20fe2651a5 Squish: Fix for tst_installed_languages 
This has been fixed now and is no more different on Mac.

Change-Id: I942164e964cce9df1c369c68036875e0da98a96a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-19 09:07:58 +01:00
Christian Stenger
67710829fa Squish: Let tst_create_proj_wizard test for Madde too 
The test will now execute as before, afterwards enable the Madde plugin
restart Qt Creator and perform the text again.

Change-Id: I08b6f3702af6541e0044f8ae047e42cc4f017a36
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-19 09:07:48 +01:00
Christian Stenger
f1a0af4b7e Squish: Fix running tst_qtquick_creation3 
...when running on build machine and VNC session has been started
by Jenkins. If so, the DISPLAY variable must be set automatically
and we should not override it.

Change-Id: Ic38267256c5ab8889d67fe6a4e7e46dba6515a67
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-15 15:37:36 +01:00
Robert Loehning
6d8e352981 Squish: Fixed typos and white spaces in getConfiguredKits() 
Change-Id: Ic5b678af17232c3ebc2da448bb45f97160aa650c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-15 13:31:05 +01:00
Christian Stenger
07d3e712fe Squish: Replace useless signal waiting 
Since Squish 4.2.3 the signal handling has been fixed and this
signal won't be caught by Squish because it was triggered by another
object.

Change-Id: I4a849084712ee99f9e63b844f832ba8dadd793ac
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-12 17:22:53 +01:00
Robert Loehning
530b2f79eb Squish: Reduced timeouts in tst_memberoperator 
Change-Id: I0945c1752500a32b45320497e12d96fa7d8f623f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-12 12:39:51 +01:00
Robert Loehning
0d9822ae80 Squish: snooze before restarting Creator in tst_installed_languages 
Change-Id: Ie548e034f74eeb201e9475950487fc636576ce10
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-11 17:34:52 +01:00
Christian Stenger
9734fc4f4c Squish: Fix tst_modify_readonly 
* Fix handling of modified files (if a file is read-only but not
expected as such the test crashed)
* Hopefully fix the permanent crash on the build machine while
waiting for the not expected message box while Creator shuts down

Change-Id: I84af2d25633f24256c20ada82acd9e13b743b4bf
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-11 16:01:19 +01:00
Christian Stenger
20c53542dc Squish: Wait a bit before checking settings 
Fails on the build machines from time to time because Squish does not
wait for Creator to quit it just invokes the menu item and checks
afterwards.

Change-Id: Ieedc2437006f5af3074c155e514489fe911e815d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-08 13:16:13 +01:00
Christian Stenger
e044e7cc69 Squish: Stabilize test for build machines 
Change-Id: I8701c6a46ef749e4c2b905554efc16746a991e56
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-08 13:16:04 +01:00
Robert Loehning
f09ce82e23 Squish: Made tst_simple_debug more strict 
Change-Id: Iac438c8a55c8ea144c682257e140f9370e999e69
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-08 12:39:33 +01:00
Robert Loehning
b2ef08a5c0 Squish: Shortened verifyBreakPoint() 
Change-Id: I98ed094ec4a6ad2545ee804934fe1674c4b97d9e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-08 12:39:14 +01:00
Christian Stenger
cc454d11fc Squish: Improve cleanup on Win 
Change-Id: If39af63b6b65cb09c351bef6158c8ae8b9837668
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-06 14:13:04 +01:00