feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.11'

Browse Source 
Conflicts:
	src/plugins/genericprojectmanager/genericprojectplugin.cpp
	src/plugins/projectexplorer/environmentaspect.cpp
	src/plugins/projectexplorer/environmentaspect.h
	src/plugins/projectexplorer/environmentaspectwidget.cpp

Change-Id: Id21d62cf14419febd1e06c9b429fcdf4501c0eaf
This commit is contained in:
Eike Ziller
2019-11-11 12:58:11 +01:00
parent a504472790 c6115771f9
commit 646c7860cb
114 changed files with 4948 additions and 764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/ctfvisualizer/ctfstatisticsmodel.h
View File

@@ -39,6 +39,7 @@ namespace Internal {
class CtfStatisticsModel : public QAbstractTableModel
{
Q_OBJECT
public:
enum Role {

2
src/plugins/ctfvisualizer/ctftracemanager.cpp
View File

@@ -153,7 +153,7 @@ void CtfTraceManager::addEvent(const json &event)
}
}
void CtfVisualizer::Internal::CtfTraceManager::load(const QString &filename)
void CtfTraceManager::load(const QString &filename)
{
clearAll();