Commit Graph

16 Commits

Author SHA1 Message Date
Eike Ziller
63ff745213 Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/libs/extensionsystem/pluginmanager.cpp
	src/libs/extensionsystem/pluginspec.cpp
	src/plugins/coreplugin/basefilewizard.cpp
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/coreplugin/editormanager/ieditor.cpp
	src/plugins/coreplugin/externaltool.cpp
	src/plugins/coreplugin/icore.cpp
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/find/ifindfilter.cpp
	src/plugins/projectexplorer/buildstep.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.cpp
	src/plugins/vcsbase/vcsbaseeditor.cpp
	tests/system/suite_debugger/tst_simple_analyze/test.py

Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
2013-09-27 10:44:32 +02:00
Robert Loehning
7d220425c1 Squish: Avoid unstable values in tst_simple_analyze
Change-Id: I88869c41f11917ea6031c45403da261b5f017e47
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-12 15:25:13 +02:00
Robert Loehning
e93f8edcb8 Squish: More output from tst_simple_analyze
Change-Id: I8dd924a427a63c5f80f7972a8b13a6ef7d3297d7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-11 15:14:23 +02:00
Robert Loehning
a22e2caadf Squish: Added further sanity checks to tst_simple_analyze
Change-Id: I40adc90d4cb73ef4ba3d7c723953d272116e193a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-09 13:50:01 +02:00
Robert Loehning
fbda0ef558 Squish: Updated tst_simple_analyze after fixes
Change-Id: I2cc19737d750117780efc57e4047c48f147f08ab
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-09 12:15:58 +02:00
Robert Loehning
d9203dac79 Squish: Skipping 4.7 in tst_simple_analyze on all platforms
Seems to happen on the Linux test machines, too.

Change-Id: Ibd6bdea3be33d50017cae8f051c7e927f7bd24f0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-15 13:10:04 +02:00
Robert Loehning
da81c07151 Squish: Don't falsify test data if test misses to push stop
Change-Id: I23e2ea40c001197e82aa7ea4fb0dad86670a4954
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-07-12 13:32:37 +02:00
Robert Loehning
b830444e24 Squish: Fix tst_simple_analyze on Windows
Seems like I broke this with
c0272c7919
Sorry!

Change-Id: I13dd9b8afe76f204fe2509f1f2f81f74c48a16ab
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-08 11:43:25 +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
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
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
Christian Stenger
1f5b3ed670 Squish: Cleanup tst_simple_analyze
* workingDir should not be global
* handle missing Qt Creator plugins on startup

Change-Id: Ibb8267da9d3443104f6d895ff98b6047f693284e
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-04-23 16:11:16 +02:00
Christian Stenger
a50f4073c8 Squish: Improved QmlProfiler test
Change-Id: I2ad50fac22a02de79643eb4d8a06c8736bb8539c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-04-22 14:12:16 +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
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
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