← Back to branch summary

~dandrader/unity8/multiInstanceApp

« back to all changes in this revision

Viewing changes to plugins/Dash/verticaljournal.h

  • Committer: Albert Astals Cid
  • Date: 2015-07-15 15:07:19 UTC
  • mto: (2004.2.7 new_and_old_audio_role)
  • mto: This revision was merged to the branch mainline in revision 2027.
  • Revision ID: albert.astals@canonical.com-20150715150719-6i15g11ap6um6b7r
Move to importing QtQuick 2.4 & friends

This means we obviously require Qt 5.4 or greater, we had for a while
but make it official now

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Dash/verticaljournal.h
90
90
    void calculateImplicitHeight() override;
91
91
    void doRelayout() override;
92
92
    void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
93
 
#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
94
 
    void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
95
 
#else
96
93
    void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
97
 
#endif
98
94
 
99
95
    QVector<QList<ViewItem>> m_columnVisibleItems;
100
96
    QHash<int, int> m_indexColumnMap;