Unity 8

Merge lp:~aacid/unity8/qt54 into lp:unity8

  1. qt54
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 1460
Merged at revision: 1470
Proposed branch: lp:~aacid/unity8/qt54
Merge into: lp:unity8
Diff against target: 142 lines (+33/-5)
8 files modified
plugins/Dash/abstractdashview.h (+4/-0)
plugins/Dash/horizontaljournal.cpp (+5/-1)
plugins/Dash/horizontaljournal.h (+4/-0)
plugins/Dash/listviewwithpageheader.cpp (+2/-2)
plugins/Dash/organicgrid.cpp (+5/-1)
plugins/Dash/organicgrid.h (+4/-0)
plugins/Dash/verticaljournal.cpp (+5/-1)
plugins/Dash/verticaljournal.h (+4/-0)
To merge this branch: bzr merge lp:~aacid/unity8/qt54
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+242892@code.launchpad.net

Commit message

Compile with Qt 5.4

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
No, just made it compile

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1460
http://jenkins.qa.ubuntu.com/job/unity8-ci/4977/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/368
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/332
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/368
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/368/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16266

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4977/rebuild

review: Approve (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Seems to build and run unit tests nicely:

https://launchpad.net/~canonical-qt5-edgers/+archive/ubuntu/qt5-beta2/+sourcepub/4588361/+listing-archive-extra

Thanks! Please land in the next Unity landing so that a no-change rebuild can be done whenever landing Qt 5.4 itself.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Dash/abstractdashview.h'
2--- plugins/Dash/abstractdashview.h 2014-05-15 14:50:23 +0000
3+++ plugins/Dash/abstractdashview.h 2014-11-26 10:14:03 +0000
4@@ -104,7 +104,11 @@
5 virtual void doRelayout() = 0;
6 virtual void updateItemCulling(qreal visibleFromY, qreal visibleToY) = 0;
7 virtual void calculateImplicitHeight() = 0;
8+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
9 virtual void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) = 0;
10+#else
11+ virtual void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) = 0;
12+#endif
13
14 QQmlDelegateModel *m_delegateModel;
15
16
17=== modified file 'plugins/Dash/horizontaljournal.cpp'
18--- plugins/Dash/horizontaljournal.cpp 2014-04-24 14:13:21 +0000
19+++ plugins/Dash/horizontaljournal.cpp 2014-11-26 10:14:03 +0000
20@@ -184,9 +184,13 @@
21 }
22 }
23
24+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
25 void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
26+#else
27+void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
28+#endif
29 {
30- Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {
31+ Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
32 for (int i = remove.count - 1; i >= 0; --i) {
33 const int indexToRemove = remove.index + i;
34 // We only support removing from the end so
35
36=== modified file 'plugins/Dash/horizontaljournal.h'
37--- plugins/Dash/horizontaljournal.h 2014-04-24 14:13:21 +0000
38+++ plugins/Dash/horizontaljournal.h 2014-11-26 10:14:03 +0000
39@@ -52,7 +52,11 @@
40 void calculateImplicitHeight() override;
41 void doRelayout() override;
42 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
43+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
44 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
45+#else
46+ void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
47+#endif
48
49 int m_firstVisibleIndex;
50 QList<QQuickItem*> m_visibleItems;
51
52=== modified file 'plugins/Dash/listviewwithpageheader.cpp'
53--- plugins/Dash/listviewwithpageheader.cpp 2014-10-13 15:42:02 +0000
54+++ plugins/Dash/listviewwithpageheader.cpp 2014-11-26 10:14:03 +0000
55@@ -936,7 +936,7 @@
56 // qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;
57 const auto oldFirstVisibleIndex = m_firstVisibleIndex;
58
59- Q_FOREACH(const QQmlChangeSet::Remove &remove, changeSet.removes()) {
60+ Q_FOREACH(const QQmlChangeSet::Change &remove, changeSet.removes()) {
61 // qDebug() << "ListViewWithPageHeader::onModelUpdated Remove" << remove.index << remove.count;
62 if (remove.index + remove.count > m_firstVisibleIndex && remove.index < m_firstVisibleIndex + m_visibleItems.count()) {
63 const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();
64@@ -990,7 +990,7 @@
65 }
66 }
67
68- Q_FOREACH(const QQmlChangeSet::Insert &insert, changeSet.inserts()) {
69+ Q_FOREACH(const QQmlChangeSet::Change &insert, changeSet.inserts()) {
70 // qDebug() << "ListViewWithPageHeader::onModelUpdated Insert" << insert.index << insert.count;
71 const bool insertingInValidIndexes = insert.index > m_firstVisibleIndex && insert.index < m_firstVisibleIndex + m_visibleItems.count();
72 const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && m_visibleItems.first()->y() + m_clipItem->y() > contentY();
73
74=== modified file 'plugins/Dash/organicgrid.cpp'
75--- plugins/Dash/organicgrid.cpp 2014-04-24 14:13:21 +0000
76+++ plugins/Dash/organicgrid.cpp 2014-11-26 10:14:03 +0000
77@@ -237,9 +237,13 @@
78 }
79 }
80
81+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
82 void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
83+#else
84+void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
85+#endif
86 {
87- Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {
88+ Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
89 for (int i = remove.count - 1; i >= 0; --i) {
90 const int indexToRemove = remove.index + i;
91 // We only support removing from the end
92
93=== modified file 'plugins/Dash/organicgrid.h'
94--- plugins/Dash/organicgrid.h 2014-04-24 14:13:21 +0000
95+++ plugins/Dash/organicgrid.h 2014-11-26 10:14:03 +0000
96@@ -79,7 +79,11 @@
97 void doRelayout() override;
98 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
99 void calculateImplicitHeight() override;
100+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
101 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
102+#else
103+ void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
104+#endif
105
106 QSizeF m_smallDelegateSize;
107 QSizeF m_bigDelegateSize;
108
109=== modified file 'plugins/Dash/verticaljournal.cpp'
110--- plugins/Dash/verticaljournal.cpp 2014-04-24 14:13:21 +0000
111+++ plugins/Dash/verticaljournal.cpp 2014-11-26 10:14:03 +0000
112@@ -239,9 +239,13 @@
113 }
114 }
115
116+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
117 void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
118+#else
119+void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
120+#endif
121 {
122- Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {
123+ Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
124 for (int i = remove.count - 1; i >= 0; --i) {
125 const int indexToRemove = remove.index + i;
126 // Since we only support removing from the end, indexToRemove
127
128=== modified file 'plugins/Dash/verticaljournal.h'
129--- plugins/Dash/verticaljournal.h 2014-04-24 14:13:21 +0000
130+++ plugins/Dash/verticaljournal.h 2014-11-26 10:14:03 +0000
131@@ -90,7 +90,11 @@
132 void calculateImplicitHeight() override;
133 void doRelayout() override;
134 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
135+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
136 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
137+#else
138+ void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
139+#endif
140
141 QVector<QList<ViewItem>> m_columnVisibleItems;
142 QHash<int, int> m_indexColumnMap;

Subscribers

People subscribed via source and target branches