git.iko.soy/unity8
on xenial help sign in
Fix Qt 5.1 FTBFS and suppress some build warnings.

Approved by PS Jenkins bot, Michael Zanetti.

commitf72075f13f9d75500a29d652d4259854b9651ecd authorMichał Sawicz <michal.sawicz@canonical.com> dateFri 27 Sep 2013, 10:35 (13 years ago) parentfb3e090fb7bd19
2 files changed+6
compare with xenial
unifiedsplit
plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+4 tests/mocks/Unity/fake_preview.cpp+2
plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+4
@@ -1009,7 +1009,11 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool
10091009 }
10101010 }
10111011
1012+#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))
10121013 Q_FOREACH(const QQuickChangeSet::Change &change, changeSet.changes()) {
1014+#else
1015+ Q_FOREACH(const QQmlChangeSet::Change &change, changeSet.changes()) {
1016+#endif
10131017// qDebug() << "ListViewWithPageHeader::onModelUpdated Change" << change.index << change.count;
10141018 for (int i = change.index; i < change.count; ++i) {
10151019 ListItem *item = itemAtIndex(i);
tests/mocks/Unity/fake_preview.cpp+2
@@ -63,4 +63,6 @@ QString Preview::imageSourceUri() const
6363
6464void Preview::execute(const QString& actionId, const QHash<QString, QVariant>& hints)
6565{
66+ Q_UNUSED(actionId);
67+ Q_UNUSED(hints);
6668}