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
94987b2f5b Squish: Another snooze() for selectFromFileDialog() 
Change-Id: Ibc24c27a8e69ba7eb039618ea416b2e84da6e617
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-06-18 13:13:50 +02:00
Christian Stenger
613d3c563a Squish: Make sure self._fix is not used undefined 
Change-Id: Iee34668ed77df9625fbc3b4fed13a903f2746099
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-06-17 15:27:45 +02:00
Christian Stenger
c8b478f0bd Squish: Stabilize invoking tab item widgets on Mac 
Change-Id: I16a61c1215d64243238a4cfbee007a78c282eb4c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-06-07 15:33:55 +02:00
Christian Stenger
a83a40d7af Squish: Added verification to selectFromCombo() 
Change-Id: I694163aeb7a588618207ec4064f93658e25e1917
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-06-07 09:54:57 +02:00
Robert Loehning
e259196593 Squish: Update handleDebuggerWarnings() 
Change-Id: Ifd0a9270f84abe15603cbf80ef18eb7450436c74
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-05-29 14:58:50 +02:00
Christian Stenger
7bb64a58f4 Squish: Move simpleFileName() into shared script 
Change-Id: I359af17fcbc67149fab4e291142523b436a43832
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-29 09:16:33 +02:00
Christian Stenger
d007681b31 Squish: Improve changePermission() 
Change-Id: I3ce1691afc2fad3949d216dee37b06a33e40f6f1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-29 09:16:25 +02:00
Robert Loehning
3b46f64272 Squish: Updated handleDebuggerWarnings() 
Change-Id: Id5129e6797b945c16ecafad92f0d00bd0edeb3cd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-28 12:10:32 +02:00
Christian Stenger
5deb6644a4 Squish: Fix strange infinite waitFor() 
This caused WELP02 to wait forever on one testing machine although
running fine on local and other testing machines.

Change-Id: Ie66c3197f63f6f3224993107d039b0cf4b817483
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-23 17:33:18 +02:00
Christian Stenger
3590eed886 Squish: Clean up before and after Qml debugging 
Change-Id: I592842964984b51669b773a9af1fdd81df032f7b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-23 17:32:52 +02:00
Eike Ziller
ef5d3796d5 Merge remote-tracking branch 'origin/2.7' into 2.8 2013-05-23 07:25:34 +02:00
Robert Loehning
f7ac7fb241 Squish: Updated createNewQmlExtension() 
Change-Id: I4739794a78fee1c347e2b63f46883f161140d360
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-17 16:35:45 +02:00
Robert Loehning
e5d6decccc Squish: Updated hook_utils 
Change-Id: I7d2f43a9283f5b8a3edff4888a6b8c3eac076038
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-17 16:35:36 +02:00
Robert Loehning
180b48003f Squish: Added copyright headers 
Change-Id: Icdf2f31f73e8b6eed75954ad31d12d48e00109b5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-15 13:35:01 +02:00
Oswald Buddenhagen
6fb94a7b10 Merge branch '2.7' 
Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
 2013-05-15 10:21:47 +02:00
Robert Loehning
3cafcba19a Squish: Updated progressBarWait() 
Change-Id: I81381dba6b0653a550a7362743939e7b943a9f00
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-15 10:12:02 +02:00
Christian Stenger
8ca5b55a0b Squish: Prepare re-usage of batch editing... 
...of the environment variables for the next run.

Change-Id: Iaf383dfa361971c75be0e180d72ab95c5df83ebe
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-15 08:59:16 +02:00
Christian Stenger
edf8b4a59b Squish: Stabilize invoking context menu items on Mac 
Change-Id: I64ed356b6120c38d51c646ae409bbbc3a4fe9e8e
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-06 12:46:18 +02:00
Eike Ziller
a2171c2d82 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
 2013-05-03 09:49:28 +02:00
Robert Loehning
c8984dc58a Squish: Using progressBarWait() instead of waitForSignal() 
Change-Id: Ia87569c080f3b54dd8f78b023408de76eb3c574c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-02 10:13:19 +02:00
Eike Ziller
bedc477943 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
 2013-04-30 11:43:33 +02:00
Robert Loehning
e793779589 Squish: Added test for renaming files 
Task-number: QTCREATORBUG-8335
Change-Id: Ie9ca9018194c955f099b7d99ab46ba26303e354d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-25 16:12:46 +02:00
Christian Stenger
d799bf31be Squish: Changed handling of workarounds 
If a bug is closed for master but still valid for the current working
branch the workaround won't be executed if started with
performWorkaroundIfStillOpen(). This leads to wrong results.
The new approach is less automatic but more error-proof.

Change-Id: If33c920be08e33c0fb2ccc4faec4ae8ff0d0f95d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-25 12:39:50 +02:00
Christian Stenger
ba6cc1d04f Squish: Cleanup workarounds.py 
Change-Id: Ibbdae1c85d49122928fda97ea5f3d83245eab7ed
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-24 13:20:41 +02:00
Christian Stenger
eab228dcca Squish: Cleanup workarounds.py 
* removed fetching status
* improved output for closed bugs

Change-Id: Ice0256f75571c6c44e9878447d3821247f5ded4f
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-23 17:04:07 +02:00
Christian Stenger
59edc40593 Squish: Add Run button to objects.map 
Change-Id: I506a030714a46a1ca3610b18daf296deaa6bfcc2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-23 16:11:37 +02:00
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
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
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
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
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
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
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