From b81396c36e3f88f4bad6f4ee5bbce7db390f6b9f Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Tue, 26 Sep 2017 12:58:40 +0200
Subject: [PATCH] QmlDesigner: Fix compile

Did not compile with GCC 5.3 because frames and frames()
are ambiguous.
The new function name is more descriptive.

Change-Id: I832a02fb56dbada07dc8622b566762fb32139d3f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 .../designercore/include/qmltimelinemutator.h          |  2 +-
 .../designercore/model/qmltimelinemutator.cpp          | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/include/qmltimelinemutator.h b/src/plugins/qmldesigner/designercore/include/qmltimelinemutator.h
index 44327fcb25c..10e00fc7b33 100644
--- a/src/plugins/qmldesigner/designercore/include/qmltimelinemutator.h
+++ b/src/plugins/qmldesigner/designercore/include/qmltimelinemutator.h
@@ -56,7 +56,7 @@ public:
 private:
     void addFramesIfNotExists(const ModelNode &node, const PropertyName &propertyName);
     bool hasFrames(const ModelNode &node, const PropertyName &propertyName) const;
-    QList<QmlTimelineFrames> frames() const;
+    QList<QmlTimelineFrames> allTimelineFrames() const;
 };
 
 } //QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/model/qmltimelinemutator.cpp b/src/plugins/qmldesigner/designercore/model/qmltimelinemutator.cpp
index 48fb954a2ed..a028b61890d 100644
--- a/src/plugins/qmldesigner/designercore/model/qmltimelinemutator.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmltimelinemutator.cpp
@@ -142,17 +142,17 @@ void QmlTimelineMutator::addFramesIfNotExists(const ModelNode &node, const Prope
 
 bool QmlTimelineMutator::hasFrames(const ModelNode &node, const PropertyName &propertyName) const
 {
-    for (const QmlTimelineFrames &tFrames : frames()) {
-        if (tFrames.target().isValid()
-                && tFrames.target() == node
-                && tFrames.propertyName() == propertyName)
+    for (const QmlTimelineFrames &frames : allTimelineFrames()) {
+        if (frames.target().isValid()
+                && frames.target() == node
+                && frames.propertyName() == propertyName)
             return true;
     }
 
     return false;
 }
 
-QList<QmlTimelineFrames> QmlTimelineMutator::frames() const
+QList<QmlTimelineFrames> QmlTimelineMutator::allTimelineFrames() const
 {
     QList<QmlTimelineFrames> returnList;