Commit Graph

7 Commits

Author SHA1 Message Date
Eike Ziller
c53ccceff1 Merge remote-tracking branch 'origin/4.9'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/debugger/debuggerkitinformation.cpp
	src/plugins/languageclient/languageclientmanager.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/kit.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I66fb941202991f35f7d7761430b21e42dfc678a8
2019-03-14 15:51:15 +01:00
hjk
164ae1428e ProjectExplorer: Move RunControl related classes to separate file pair
Change-Id: I5da56f80336673d595907abcc797f628be680cd5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-03-13 14:44:46 +00:00
Robert Loehning
7570fa1687 PerfProfiler: Remove misplaced white space
Change-Id: I3627bb4b82e448ca658a7bca014ce23e6ec55cf2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2019-03-07 12:35:31 +00:00
Christian Kandeler
83dd031960 ProjectExplorer: Rename KitInformation to KitAspect
The name "KitInformation" does not properly convey the fact that it
represents a certain *aspect* of a kit. The same goes for
"KitConfigWidget", which in addition was inconsistent with
"KitInformation".
We now use "KitAspect" and "KitAspectWidget".

Change-Id: I9804ee4cedc4d61fad533ea1dd4e4720e67fde97
Reviewed-by: hjk <hjk@qt.io>
2019-02-11 11:55:01 +00:00
Ulf Hermann
e25be3d5ee PerfProfiler: Allow creating trace points without valid project
We can still create trace points on the desktop device then.

Change-Id: I123bece2d11a6405883e0bcec9b066cec4e017b9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-02-07 12:14:32 +00:00
Ulf Hermann
a7435ae785 PerfProfiler: Handle failure to read trace point script file
We can just write an error message into the text edit in that case.

Change-Id: I9ab0ab226bd8f171ab1a693884053a8c759cec2b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-01-09 07:58:51 +00:00
Ulf Hermann
75d070b9b8 Add PerfProfiler plugin
This moves the previously commercial PerfProfiler plugin into QtCreator.

Task-number: QTCREATORBUG-21344
Change-Id: I41f4a9451c2fe8ff4e1108e07db2e72e8c613c43
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-12-18 17:26:45 +00:00