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
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
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
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
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
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
Christian Stenger
2ed55c8076 Squish: Provide function for writing out results 
...in preparation for adding these to the automatic statistic thingy.

Change-Id: Ieeab062b426ac3b9053d0499fdb38f0abacb89c9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-06 08:49:38 +01:00
Christian Stenger
d101a3609c Squish: Fix hook into QtQuick and QtQuick UI 
Change-Id: I168ee74464cfc1ae9efbd69f8e0f3cb10cbbf2d4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-04 12:53:08 +01:00
Robert Loehning
65a07823ac Squish: Report error in selectFromFileDialog() 
Change-Id: Ib32a1b78106a298996e1d29207998fc8f312208e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-01 12:49:14 +01:00
Robert Loehning
497eb16455 Squish: Make sure file was opened in tst_select_all 
Change-Id: Iad2c590fd7cc87d8267ecdca515dbef48480e9ed
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-28 17:47:25 +01:00
Robert Loehning
482c8c0f6b Squish: Downgraded fatal to warning 
Change-Id: I8bf3e3d562daddd80ece4c23cc1b5373bfe7eefd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-28 13:51:12 +01:00
Robert Loehning
7cb50891dd Squish: Don't use global variable for __isWinFirewallRunning__() 
Change-Id: Iaad1da549addbb856515ae95ece4ae43246637fa
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-28 13:33:46 +01:00
Robert Loehning
fac11973af Squish: Syntax fix 
Change-Id: I33dcde34b176b5918d976c3e474a7702b53a2fa3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-28 11:55:40 +01:00
Christian Stenger
86d3e075ff Squish: catch plugin loader error if it occurs 
...and stop execution of the current test case

Change-Id: I46ac21e79f643f6890b7303d08c204dcd9fa9386
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-22 16:52:13 +01:00
Christian Stenger
4a78d4da3f Squish: Fix wrong signal handler call 
Change-Id: I94020e0afa85a86f5eb80fe4cf1cbb4c58edb6a6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-22 16:43:40 +01:00
Robert Loehning
7c9d2e3a1a Squish: Fix invoking context menu sub items 
Change-Id: I7d498ac3d4e2e2d25b3c504a95f96e434d0d1619
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-21 13:55:45 +01:00
Christian Stenger
80263a5221 Squish: Fix some Mac/Squish issues 
Details:
* wrong shortcut usage replaced
* timing issues fixed
* re-used the editor-focus-on-mac workaround for some tests

Change-Id: Ie0d65d941c999d545bd50e1cf4794624c4110247
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-18 12:56:46 +01:00
Robert Loehning
dd32d14a55 Squish: Removed unused functions 
Change-Id: Ia9b63b9d4846b425cfa52ded0a0f5f54f4c4f0ed
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-18 12:16:04 +01:00
Christian Stenger
85ec0cdfbe Squish: Improve ensureChecked() 
...to avoid misbehaviour especially on Mac.

Change-Id: I25053ea34b180a60d9a260798f7758df8a1224e2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-15 14:31:55 +01:00
Christian Stenger
b090616016 Squish: Fix tests for disabled Madde Plugin 
Part 2: Fixing evaluation of configured kits depending on available
Qt versions as well as determining supported platforms.

Additionally enable verifications for Plain C and Plain C++ projects
as well.

Change-Id: I1f92b44c6771dfc9353b911fdb1ec654c5cc591b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-08 17:04:57 +01:00
Christian Stenger
dae2198346 Squish: Fix tests for disabled Madde Plugin 
Part 1: Fix expected targets

Change-Id: I4acfcde6c6d347065047e91f6d65b6418aade7b3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-08 17:04:49 +01:00
Robert Loehning
ca4b3f9d1d Squish: Wait for parsing in createNewQtQuickApplication() 
This is what createProject_Qt_GUI() and
createProject_Qt_Console() have always done

Change-Id: Iaead1767c699e4fd237d999e6f3d94d277b1d84f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-08 10:30:37 +01:00
Christian Stenger
18089cea55 Squish: Skip hook-into for mismatched Squish version 
If the Squish version of the running AUT and the subprocess do
not match hooking into the subprocess fails because of using
different protocols.

Change-Id: I2e94c5ec2fbdc30aa39885bf1619df445c10f40b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-07 16:57:58 +01:00
Robert Loehning
ec1d081178 Squish: Fix hooking for multiple kits 
Change-Id: I5389d6aadd39f6c7f7ca6a74e006b110373eee28
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-06 13:49:14 +01:00
Christian Stenger
8485f64c6b Squish: Fix verification of compile output 
Change-Id: I1c55e826a79fa0f36d2870cfcb08a325ba6408e1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-04 16:47:05 +01:00
Christian Stenger
df1f7796ba Squish: Fix tst_SCOM05 
Change-Id: I63b5266639a272ee94cc50978f87634f09ff4177
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-01 13:01:05 +01:00
Christian Stenger
58c45ca766 Squish: Added test case for default settings 
Change-Id: I669a4a464b966ef9cf5a89f38e95e142e3574a1c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-01-31 16:16:33 +01:00
Robert Loehning
6ebb71ab57 Squish: Fixed tst_simple_debug 
Change-Id: I12053784d9d897525e29c40ea806f680577c6c09
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-31 14:27:27 +01:00
Robert Loehning
58e4a5fb5e Squish: Fixed opening of files 
Change-Id: Ia96a4a000cac1dde0f660e5f58141a73c7625a1e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-31 11:22:17 +01:00
Christian Stenger
4cb9f675aa Squish: use new approach for markText() 
This new approach is a bit slower than using Qt functionality,
but it's now completely relying on user-interaction.

Change-Id: I361f6f201dfff8122a11aae30204eb79967fe4ae
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-01-28 17:07:12 +01:00