diff --git a/src/plugins/qmlprofiler/qmlprofilertimelinemodel.cpp b/src/plugins/qmlprofiler/qmlprofilertimelinemodel.cpp
index e3c22620f75..b2411a5da8e 100644
--- a/src/plugins/qmlprofiler/qmlprofilertimelinemodel.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertimelinemodel.cpp
@@ -101,6 +101,8 @@ void QmlProfilerTimelineModel::dataChanged()
     default:
         break;
     }
+
+    emit labelsChanged();
 }
 
 int QmlProfilerTimelineModel::bindingLoopDest(int index) const
diff --git a/src/plugins/qmlprofiler/timelinemodel.cpp b/src/plugins/qmlprofiler/timelinemodel.cpp
index 5d936de52e5..335f25e0c7b 100644
--- a/src/plugins/qmlprofiler/timelinemodel.cpp
+++ b/src/plugins/qmlprofiler/timelinemodel.cpp
@@ -107,7 +107,11 @@ int TimelineModel::collapsedRowCount() const
 void TimelineModel::setCollapsedRowCount(int rows)
 {
     Q_D(TimelineModel);
-    d->collapsedRowCount = rows;
+    if (d->collapsedRowCount != rows) {
+        d->collapsedRowCount = rows;
+        if (!d->expanded)
+            emit rowCountChanged();
+    }
 }
 
 int TimelineModel::expandedRowCount() const
@@ -119,7 +123,11 @@ int TimelineModel::expandedRowCount() const
 void QmlProfiler::TimelineModel::setExpandedRowCount(int rows)
 {
     Q_D(TimelineModel);
-    d->expandedRowCount = rows;
+    if (d->expandedRowCount != rows) {
+        d->expandedRowCount = rows;
+        if (d->expanded)
+            emit rowCountChanged();
+    }
 }
 
 
@@ -135,6 +143,7 @@ void TimelineModel::TimelineModelPrivate::init(TimelineModel *q)
     connect(q,SIGNAL(rowHeightChanged()),q,SIGNAL(heightChanged()));
     connect(q,SIGNAL(expandedChanged()),q,SIGNAL(heightChanged()));
     connect(q,SIGNAL(hiddenChanged()),q,SIGNAL(heightChanged()));
+    connect(q,SIGNAL(emptyChanged()),q,SIGNAL(heightChanged()));
 }
 
 
@@ -221,11 +230,10 @@ int TimelineModel::height() const
     if (d->hidden || isEmpty())
         return 0;
 
-    int depth = rowCount();
-    if (d->hidden || !d->expanded || d->rowOffsets.empty())
-        return depth * TimelineModelPrivate::DefaultRowHeight;
+    if (!d->expanded || d->rowOffsets.empty())
+        return rowCount() * TimelineModelPrivate::DefaultRowHeight;
 
-    return d->rowOffsets.last() + (depth - d->rowOffsets.size()) *
+    return d->rowOffsets.last() + (rowCount() - d->rowOffsets.size()) *
             TimelineModelPrivate::DefaultRowHeight;
 }
 
@@ -442,6 +450,8 @@ void TimelineModel::setExpanded(bool expanded)
     if (expanded != d->expanded) {
         d->expanded = expanded;
         emit expandedChanged();
+        if (d->collapsedRowCount != d->expandedRowCount)
+            emit rowCountChanged();
     }
 }
 
@@ -489,10 +499,12 @@ int TimelineModel::selectionId(int index) const
 void TimelineModel::clear()
 {
     Q_D(TimelineModel);
-    d->collapsedRowCount = d->expandedRowCount = 1;
+    bool hadRows = (rowCount() != 1);
     bool wasExpanded = d->expanded;
     bool wasHidden = d->hidden;
     bool hadRowHeights = !d->rowOffsets.empty();
+    bool wasEmpty = isEmpty();
+    d->collapsedRowCount = d->expandedRowCount = 1;
     d->rowOffsets.clear();
     d->expanded = false;
     d->hidden = false;
@@ -504,6 +516,10 @@ void TimelineModel::clear()
         emit expandedChanged();
     if (wasHidden)
         emit hiddenChanged();
+    if (hadRows)
+        emit rowCountChanged();
+    if (!wasEmpty)
+        emit emptyChanged();
 }
 
 int TimelineModel::nextItemBySelectionId(int selectionId, qint64 time, int currentItem) const
diff --git a/src/plugins/qmlprofiler/timelinemodel.h b/src/plugins/qmlprofiler/timelinemodel.h
index b1ca9e182f3..c50f318b223 100644
--- a/src/plugins/qmlprofiler/timelinemodel.h
+++ b/src/plugins/qmlprofiler/timelinemodel.h
@@ -47,7 +47,11 @@ class QMLPROFILER_EXPORT TimelineModel : public QObject
     Q_PROPERTY(QString displayName READ displayName CONSTANT)
     Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged)
     Q_PROPERTY(bool hidden READ hidden WRITE setHidden NOTIFY hiddenChanged)
+    Q_PROPERTY(bool expanded READ expanded WRITE setExpanded NOTIFY expandedChanged)
     Q_PROPERTY(int height READ height NOTIFY heightChanged)
+    Q_PROPERTY(int rowCount READ rowCount NOTIFY rowCountChanged)
+    Q_PROPERTY(QVariantList labels READ labels NOTIFY labelsChanged)
+    Q_PROPERTY(int count READ count NOTIFY emptyChanged)
 
 public:
     class TimelineModelPrivate;
@@ -58,15 +62,15 @@ public:
     // Methods implemented by the abstract model itself
     bool isEmpty() const;
     int modelId() const;
-    int rowHeight(int rowNumber) const;
-    int rowOffset(int rowNumber) const;
-    void setRowHeight(int rowNumber, int height);
+    Q_INVOKABLE int rowHeight(int rowNumber) const;
+    Q_INVOKABLE int rowOffset(int rowNumber) const;
+    Q_INVOKABLE void setRowHeight(int rowNumber, int height);
     int height() const;
     int count() const;
-    qint64 duration(int index) const;
-    qint64 startTime(int index) const;
-    qint64 endTime(int index) const;
-    int selectionId(int index) const;
+    Q_INVOKABLE qint64 duration(int index) const;
+    Q_INVOKABLE qint64 startTime(int index) const;
+    Q_INVOKABLE qint64 endTime(int index) const;
+    Q_INVOKABLE int selectionId(int index) const;
 
     int firstIndex(qint64 startTime) const;
     int lastIndex(qint64 endTime) const;
@@ -79,20 +83,21 @@ public:
     int rowCount() const;
 
     // Methods that have to be implemented by child models
-    virtual QColor color(int index) const = 0;
+    Q_INVOKABLE virtual QColor color(int index) const = 0;
     virtual QVariantList labels() const = 0;
-    virtual QVariantMap details(int index) const = 0;
-    virtual int row(int index) const = 0;
+    Q_INVOKABLE virtual QVariantMap details(int index) const = 0;
+    Q_INVOKABLE virtual int row(int index) const = 0;
 
     // Methods which can optionally be implemented by child models.
     // returned map should contain "file", "line", "column" properties, or be empty
-    virtual QVariantMap location(int index) const;
-    virtual int typeId(int index) const;
-    virtual bool handlesTypeId(int typeId) const;
-    virtual int selectionIdForLocation(const QString &filename, int line, int column) const;
-    virtual float relativeHeight(int index) const;
-    virtual int rowMinValue(int rowNumber) const;
-    virtual int rowMaxValue(int rowNumber) const;
+    Q_INVOKABLE virtual QVariantMap location(int index) const;
+    Q_INVOKABLE virtual int typeId(int index) const;
+    Q_INVOKABLE virtual bool handlesTypeId(int typeId) const;
+    Q_INVOKABLE virtual int selectionIdForLocation(const QString &filename, int line,
+                                                   int column) const;
+    Q_INVOKABLE virtual float relativeHeight(int index) const;
+    Q_INVOKABLE virtual int rowMinValue(int rowNumber) const;
+    Q_INVOKABLE virtual int rowMaxValue(int rowNumber) const;
 
     Q_INVOKABLE int nextItemBySelectionId(int selectionId, qint64 time, int currentItem) const;
     Q_INVOKABLE int nextItemByTypeId(int typeId, qint64 time, int currentItem) const;
@@ -107,6 +112,8 @@ signals:
     void rowHeightChanged();
     void emptyChanged();
     void heightChanged();
+    void rowCountChanged();
+    void labelsChanged();
 
 protected:
     QColor colorBySelectionId(int index) const;