diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-11-11 12:58:11 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-11-11 12:58:11 +0100 |
| commit | 646c7860cb95fd7e6c36aa640ea1a2f5fde7d59a (patch) | |
| tree | 727866c9ea7a22f61978e56212e5fd99726b128d /src/plugins/ctfvisualizer | |
| parent | a5044727900b3db78746ae17f72d20da1fd3a8ca (diff) | |
| parent | c6115771f9b71e065cb49328bf9d387d327ac996 (diff) | |
| download | qt-creator-646c7860cb95fd7e6c36aa640ea1a2f5fde7d59a.tar.gz | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
src/plugins/genericprojectmanager/genericprojectplugin.cpp
src/plugins/projectexplorer/environmentaspect.cpp
src/plugins/projectexplorer/environmentaspect.h
src/plugins/projectexplorer/environmentaspectwidget.cpp
Change-Id: Id21d62cf14419febd1e06c9b429fcdf4501c0eaf
Diffstat (limited to 'src/plugins/ctfvisualizer')
| -rw-r--r-- | src/plugins/ctfvisualizer/ctfstatisticsmodel.h | 1 | ||||
| -rw-r--r-- | src/plugins/ctfvisualizer/ctftracemanager.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/ctfvisualizer/ctfstatisticsmodel.h b/src/plugins/ctfvisualizer/ctfstatisticsmodel.h index 434d7c9c96..32ae272173 100644 --- a/src/plugins/ctfvisualizer/ctfstatisticsmodel.h +++ b/src/plugins/ctfvisualizer/ctfstatisticsmodel.h @@ -39,6 +39,7 @@ namespace Internal { class CtfStatisticsModel : public QAbstractTableModel { + Q_OBJECT public: enum Role { diff --git a/src/plugins/ctfvisualizer/ctftracemanager.cpp b/src/plugins/ctfvisualizer/ctftracemanager.cpp index 52859e08b1..157c565a32 100644 --- a/src/plugins/ctfvisualizer/ctftracemanager.cpp +++ b/src/plugins/ctfvisualizer/ctftracemanager.cpp @@ -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(); |