diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-06-03 10:49:11 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-06-03 10:49:11 +0200 |
| commit | 60da2d7c6748c82aebd607ea92ad1ec24566c855 (patch) | |
| tree | e1ce85b691a61ee4981b62bb709cb271f75af47e /src | |
| parent | fb41fb8a206b2a0b6cbb064fa876346469c656c1 (diff) | |
| parent | e23ebfbd205497b449f48f0493f5d89ad535b8e3 (diff) | |
Merge remote-tracking branch 'origin/4.10'
Change-Id: I362555983841fa3005f0da7dd790d91c56ea448d
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesectionitem.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesectionitem.cpp b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesectionitem.cpp index 7cb9760a51..32012dd145 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesectionitem.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesectionitem.cpp @@ -106,7 +106,8 @@ TimelineSectionItem *TimelineSectionItem::create(const QmlTimeline &timeline, { auto item = new TimelineSectionItem(parent); - item->setToolTip(target.id()); + if (target.isValid()) + item->setToolTip(target.id()); item->m_targetNode = target; item->m_timeline = timeline; |