diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-06-03 10:46:09 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-06-03 10:46:09 +0200 |
| commit | e23ebfbd205497b449f48f0493f5d89ad535b8e3 (patch) | |
| tree | 0e3805d86943dd14b34d242b9778c9cfcc294299 /src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesectionitem.cpp | |
| parent | 23c222f61b260b56c10775197d6100f130d558b4 (diff) | |
| parent | df22fb083b659cd4f3863cc5484c74a11d6de226 (diff) | |
| download | qt-creator-e23ebfbd205497b449f48f0493f5d89ad535b8e3.tar.gz | |
Merge remote-tracking branch 'origin/4.9' into 4.10
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
Change-Id: Id73301c82c4ba50e0a886e850da2c92bbeed4dc3
Diffstat (limited to 'src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesectionitem.cpp')
| -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; |