← Back to branch summary

~unity-team/unity8/hotfix-launcher-on-dash

« back to all changes in this revision

Viewing changes to plugins/DashViews/organicgrid.h

  • Committer: Michael Terry
  • Date: 2014-05-05 22:07:57 UTC
  • mfrom: (881 unity8)
  • mto: (138.5.2 split-logrotate)
  • mto: This revision was merged to the branch mainline in revision 933.
  • Revision ID: michael.terry@canonical.com-20140505220757-dwz5ulj42vz1ahxv
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/DashViews/organicgrid.h
79
79
    void doRelayout() override;
80
80
    void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
81
81
    void calculateImplicitHeight() override;
82
 
#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))
83
 
    void processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes) override;
84
 
#else
85
82
    void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
86
 
#endif
87
83
 
88
84
    QSizeF m_smallDelegateSize;
89
85
    QSizeF m_bigDelegateSize;