1573b2c · unity8 · git.iko.soy

git.iko.soy/unity8

Merged https://code.launchpad.net/+branch/~aacid/unity8/killqt51

commit1573b2cb040e4919ad05946d607c2ca6243e8cb6 authorJosh Arenson <joshua.arenson@canonical.com> dateFri 25 Apr 2014, 10:41 (12 years ago) parent97d84ce 6873fcb

16 files changed+14−206

compare with xenial

unifiedsplit

CMakeLists.txt+5−5 debian/control+4−4 plugins/DashViews/abstractdashview.cpp−34 plugins/DashViews/abstractdashview.h−17 plugins/DashViews/horizontaljournal.cpp−12 plugins/DashViews/horizontaljournal.h−4 plugins/DashViews/listviewwithpageheader.cpp−50 plugins/DashViews/listviewwithpageheader.h−20 plugins/DashViews/organicgrid.cpp−8 plugins/DashViews/organicgrid.h−4 plugins/DashViews/verticaljournal.cpp−8 plugins/DashViews/verticaljournal.h−4 po/ug.po+5−5 tests/plugins/DashViews/listviewwithpageheadertest.cpp−15 tests/plugins/DashViews/listviewwithpageheadertestsection.cpp−12 tests/plugins/DashViews/listviewwithpageheadertestsectionexternalmodel.cpp−4

CMakeLists.txt+5−5

@@ -48,11 +48,11 @@ add_custom_target(cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2

4848 ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)

4949

5050include(FindPkgConfig)

51−find_package(Qt5Core)

52−find_package(Qt5Qml)

53−find_package(Qt5Quick)

54−find_package(Qt5Gui)

55−find_package(Qt5DBus)

51+find_package(Qt5Core 5.2 REQUIRED)

52+find_package(Qt5Qml 5.2 REQUIRED)

53+find_package(Qt5Quick 5.2 REQUIRED)

54+find_package(Qt5Gui 5.2 REQUIRED)

55+find_package(Qt5DBus 5.2 REQUIRED)

5656

5757# Standard install paths

5858include(GNUInstallDirs)

debian/control+4−4

@@ -26,13 +26,13 @@ Build-Depends: cmake,

2626 python3-all:any,

2727 python3-setuptools,

2828 qt5-default,

29− qtbase5-dev,

29+ qtbase5-dev (>= 5.2.1),

3030 qtbase5-dev-tools,

31− qtbase5-private-dev,

32− qtdeclarative5-dev,

31+ qtbase5-private-dev (>= 5.2.1),

32+ qtdeclarative5-dev (>= 5.2.1),

3333 qtdeclarative5-dev-tools,

3434 qtdeclarative5-qtmultimedia-plugin,

35− qtdeclarative5-private-dev,

35+ qtdeclarative5-private-dev (>= 5.2.1),

3636 qtdeclarative5-qtquick2-plugin,

3737 qtdeclarative5-test-plugin,

3838 qtdeclarative5-ubuntu-settings-components,

plugins/DashViews/abstractdashview.cpp−34

@@ -46,17 +46,10 @@ void AbstractDashView::setModel(QAbstractItemModel *model)

4646 if (!m_delegateModel) {

4747 createDelegateModel();

4848 } else {

49−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

50− disconnect(m_delegateModel, SIGNAL(modelUpdated(QQuickChangeSet,bool)), this, SLOT(onModelUpdated(QQuickChangeSet,bool)));

51− }

52− m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));

53− connect(m_delegateModel, SIGNAL(modelUpdated(QQuickChangeSet,bool)), this, SLOT(onModelUpdated(QQuickChangeSet,bool)));

54−#else

5549 disconnect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(onModelUpdated(QQmlChangeSet,bool)));

5650 }

5751 m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));

5852 connect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(onModelUpdated(QQmlChangeSet,bool)));

59−#endif

6053

6154 cleanupExistingItems();

6255

@@ -181,13 +174,8 @@ void AbstractDashView::resetDelegateCreationEnd()

181174

182175void AbstractDashView::createDelegateModel()

183176{

184−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

185− m_delegateModel = new QQuickVisualDataModel(qmlContext(this), this);

186− connect(m_delegateModel, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(itemCreated(int,QQuickItem*)));

187−#else

188177 m_delegateModel = new QQmlDelegateModel(qmlContext(this), this);

189178 connect(m_delegateModel, SIGNAL(createdItem(int,QObject*)), this, SLOT(itemCreated(int,QObject*)));

190−#endif

191179 if (isComponentComplete())

192180 m_delegateModel->componentComplete();

193181}

@@ -253,16 +241,9 @@ QQuickItem *AbstractDashView::createItem(int modelIndex, bool asynchronous)

253241 return nullptr;

254242

255243 m_asyncRequestedIndex = -1;

256−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

257− QQuickItem *item = m_delegateModel->item(modelIndex, asynchronous);

258−#else

259244 QObject* object = m_delegateModel->object(modelIndex, asynchronous);

260245 QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

261−#endif

262246 if (!item) {

263−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

264− m_asyncRequestedIndex = modelIndex;

265−#else

266247 if (object) {

267248 m_delegateModel->release(object);

268249 if (!m_delegateValidated) {

@@ -273,7 +254,6 @@ QQuickItem *AbstractDashView::createItem(int modelIndex, bool asynchronous)

273254 } else {

274255 m_asyncRequestedIndex = modelIndex;

275256 }

276−#endif

277257 return nullptr;

278258 } else {

279259 addItemToView(modelIndex, item);

@@ -283,13 +263,8 @@ QQuickItem *AbstractDashView::createItem(int modelIndex, bool asynchronous)

283263

284264void AbstractDashView::releaseItem(QQuickItem *item)

285265{

286−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

287− QQuickVisualModel::ReleaseFlags flags = m_delegateModel->release(item);

288− if (flags & QQuickVisualModel::Destroyed) {

289−#else

290266 QQmlDelegateModel::ReleaseFlags flags = m_delegateModel->release(item);

291267 if (flags & QQmlDelegateModel::Destroyed) {

292−#endif

293268 item->setParentItem(nullptr);

294269 }

295270}

@@ -299,10 +274,6 @@ void AbstractDashView::setImplicitHeightDirty()

299274 m_implicitHeightDirty = true;

300275}

301276

302−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

303−void AbstractDashView::itemCreated(int modelIndex, QQuickItem *item)

304−{

305−#else

306277void AbstractDashView::itemCreated(int modelIndex, QObject *object)

307278{

308279 QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

@@ -310,7 +281,6 @@ void AbstractDashView::itemCreated(int modelIndex, QObject *object)

310281 qWarning() << "AbstractDashView::itemCreated got a non item for index" << modelIndex;

311282 return;

312283 }

313−#endif

314284 item->setParentItem(this);

315285

316286 // We only need to call createItem if we are here because of an asynchronous generation

@@ -325,11 +295,7 @@ void AbstractDashView::itemCreated(int modelIndex, QObject *object)

325295 }

326296}

327297

328−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

329−void AbstractDashView::onModelUpdated(const QQuickChangeSet &changeSet, bool reset)

330−#else

331298void AbstractDashView::onModelUpdated(const QQmlChangeSet &changeSet, bool reset)

332−#endif

333299{

334300 if (reset) {

335301 cleanupExistingItems();

plugins/DashViews/abstractdashview.h−17

@@ -23,12 +23,8 @@ class QAbstractItemModel;

2323class QQmlComponent;

2424#pragma GCC diagnostic push

2525#pragma GCC diagnostic ignored "-pedantic"

26−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

27−#include <private/qquickvisualdatamodel_p.h>

28−#else

2926#include <private/qqmldelegatemodel_p.h>

3027#include <qqmlinfo.h>

31−#endif

3228#pragma GCC diagnostic pop

3329

3430class AbstractDashView : public QQuickItem

@@ -94,13 +90,8 @@ protected:

9490 void setImplicitHeightDirty();

9591

9692private Q_SLOTS:

97−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

98− void itemCreated(int modelIndex, QQuickItem *item);

99− void onModelUpdated(const QQuickChangeSet &changeSet, bool reset);

100−#else

10193 void itemCreated(int modelIndex, QObject *object);

10294 void onModelUpdated(const QQmlChangeSet &changeSet, bool reset);

103−#endif

10495 void onHeightChanged();

10596

10697private:

@@ -117,17 +108,9 @@ private:

117108 virtual void doRelayout() = 0;

118109 virtual void updateItemCulling(qreal visibleFromY, qreal visibleToY) = 0;

119110 virtual void calculateImplicitHeight() = 0;

120−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

121− virtual void processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes) = 0;

122−#else

123111 virtual void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) = 0;

124−#endif

125112

126−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

127− QQuickVisualDataModel *m_delegateModel;

128−#else

129113 QQmlDelegateModel *m_delegateModel;

130−#endif

131114

132115 // Index we are waiting because we requested it asynchronously

133116 int m_asyncRequestedIndex;

plugins/DashViews/horizontaljournal.cpp−12

@@ -28,12 +28,8 @@

2828#include <qqmlengine.h>

2929#pragma GCC diagnostic push

3030#pragma GCC diagnostic ignored "-pedantic"

31−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

32−#include <private/qquickvisualdatamodel_p.h>

33−#else

3431#include <private/qqmldelegatemodel_p.h>

3532#include <qqmlinfo.h>

36−#endif

3733#include <private/qquickitem_p.h>

3834#pragma GCC diagnostic pop

3935

@@ -188,17 +184,9 @@ void HorizontalJournal::calculateImplicitHeight()

188184 }

189185}

190186

191−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

192−void HorizontalJournal::processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes)

193−#else

194187void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)

195−#endif

196188{

197−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

198− Q_FOREACH(const QQuickChangeSet::Remove &remove, removes) {

199−#else

200189 Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {

201−#endif

202190 for (int i = remove.count - 1; i >= 0; --i) {

203191 const int indexToRemove = remove.index + i;

204192 // We only support removing from the end so

plugins/DashViews/horizontaljournal.h−4

@@ -52,11 +52,7 @@ private:

5252 void calculateImplicitHeight() override;

5353 void doRelayout() override;

5454 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

55−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

56− void processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes) override;

57−#else

5855 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;

59−#endif

6056

6157 int m_firstVisibleIndex;

6258 QList<QQuickItem*> m_visibleItems;

plugins/DashViews/listviewwithpageheader.cpp−50

@@ -97,11 +97,7 @@

9797#include <qqmlengine.h>

9898#pragma GCC diagnostic push

9999#pragma GCC diagnostic ignored "-pedantic"

100−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

101−#include <private/qquickvisualdatamodel_p.h>

102−#else

103100#include <private/qqmldelegatemodel_p.h>

104−#endif

105101#include <private/qqmlglobal_p.h>

106102#include <private/qquickitem_p.h>

107103#include <private/qquickanimation_p.h>

@@ -191,17 +187,10 @@ void ListViewWithPageHeader::setModel(QAbstractItemModel *model)

191187 if (!m_delegateModel) {

192188 createDelegateModel();

193189 } else {

194−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

195− disconnect(m_delegateModel, SIGNAL(modelUpdated(QQuickChangeSet,bool)), this, SLOT(onModelUpdated(QQuickChangeSet,bool)));

196− }

197− m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));

198− connect(m_delegateModel, SIGNAL(modelUpdated(QQuickChangeSet,bool)), this, SLOT(onModelUpdated(QQuickChangeSet,bool)));

199−#else

200190 disconnect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(onModelUpdated(QQmlChangeSet,bool)));

201191 }

202192 m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));

203193 connect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(onModelUpdated(QQmlChangeSet,bool)));

204−#endif

205194 Q_EMIT modelChanged();

206195 polish();

207196 // TODO?

@@ -570,13 +559,8 @@ void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)

570559

571560void ListViewWithPageHeader::createDelegateModel()

572561{

573−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

574− m_delegateModel = new QQuickVisualDataModel(qmlContext(this), this);

575− connect(m_delegateModel, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(itemCreated(int,QQuickItem*)));

576−#else

577562 m_delegateModel = new QQmlDelegateModel(qmlContext(this), this);

578563 connect(m_delegateModel, SIGNAL(createdItem(int,QObject*)), this, SLOT(itemCreated(int,QObject*)));

579−#endif

580564 if (isComponentComplete())

581565 m_delegateModel->componentComplete();

582566 updateWatchedRoles();

@@ -657,13 +641,8 @@ bool ListViewWithPageHeader::addVisibleItems(qreal fillFrom, qreal fillTo, bool

657641void ListViewWithPageHeader::reallyReleaseItem(ListItem *listItem)

658642{

659643 QQuickItem *item = listItem->m_item;

660−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

661− QQuickVisualModel::ReleaseFlags flags = m_delegateModel->release(item);

662− if (flags & QQuickVisualModel::Destroyed) {

663−#else

664644 QQmlDelegateModel::ReleaseFlags flags = m_delegateModel->release(item);

665645 if (flags & QQmlDelegateModel::Destroyed) {

666−#endif

667646 item->setParentItem(nullptr);

668647 }

669648 delete listItem->m_sectionItem;

@@ -796,16 +775,9 @@ ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIn

796775 return nullptr;

797776

798777 m_asyncRequestedIndex = -1;

799−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

800− QQuickItem *item = m_delegateModel->item(modelIndex, asynchronous);

801−#else

802778 QObject* object = m_delegateModel->object(modelIndex, asynchronous);

803779 QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

804−#endif

805780 if (!item) {

806−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

807− m_asyncRequestedIndex = modelIndex;

808−#else

809781 if (object) {

810782 m_delegateModel->release(object);

811783 if (!m_delegateValidated) {

@@ -816,7 +788,6 @@ ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIn

816788 } else {

817789 m_asyncRequestedIndex = modelIndex;

818790 }

819−#endif

820791 return 0;

821792 } else {

822793// qDebug() << "ListViewWithPageHeader::createItem::We have the item" << modelIndex << item;

@@ -872,10 +843,6 @@ ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIn

872843 }

873844}

874845

875−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

876−void ListViewWithPageHeader::itemCreated(int modelIndex, QQuickItem *item)

877−{

878−#else

879846void ListViewWithPageHeader::itemCreated(int modelIndex, QObject *object)

880847{

881848 QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

@@ -883,7 +850,6 @@ void ListViewWithPageHeader::itemCreated(int modelIndex, QObject *object)

883850 qWarning() << "ListViewWithPageHeader::itemCreated got a non item for index" << modelIndex;

884851 return;

885852 }

886−#endif

887853// qDebug() << "ListViewWithPageHeader::itemCreated" << modelIndex << item;

888854 // Check we are not being taken down and don't paint anything

889855 // TODO Check if we still need this in 5.2

@@ -924,21 +890,13 @@ void ListViewWithPageHeader::onHeightChanged()

924890}

925891

926892

927−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

928−void ListViewWithPageHeader::onModelUpdated(const QQuickChangeSet &changeSet, bool /*reset*/)

929−#else

930893void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool /*reset*/)

931−#endif

932894{

933895 // TODO Do something with reset

934896// qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;

935897 const auto oldFirstVisibleIndex = m_firstVisibleIndex;

936898

937−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

938− Q_FOREACH(const QQuickChangeSet::Remove &remove, changeSet.removes()) {

939−#else

940899 Q_FOREACH(const QQmlChangeSet::Remove &remove, changeSet.removes()) {

941−#endif

942900// qDebug() << "ListViewWithPageHeader::onModelUpdated Remove" << remove.index << remove.count;

943901 if (remove.index + remove.count > m_firstVisibleIndex && remove.index < m_firstVisibleIndex + m_visibleItems.count()) {

944902 const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();

@@ -992,11 +950,7 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool

992950 }

993951 }

994952

995−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

996− Q_FOREACH(const QQuickChangeSet::Insert &insert, changeSet.inserts()) {

997−#else

998953 Q_FOREACH(const QQmlChangeSet::Insert &insert, changeSet.inserts()) {

999−#endif

1000954// qDebug() << "ListViewWithPageHeader::onModelUpdated Insert" << insert.index << insert.count;

1001955 const bool insertingInValidIndexes = insert.index > m_firstVisibleIndex && insert.index < m_firstVisibleIndex + m_visibleItems.count();

1002956 const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && m_visibleItems.first()->y() + m_clipItem->y() > contentY();

@@ -1054,11 +1008,7 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool

10541008 }

10551009 }

10561010

1057−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

1058− Q_FOREACH(const QQuickChangeSet::Change &change, changeSet.changes()) {

1059−#else

10601011 Q_FOREACH(const QQmlChangeSet::Change &change, changeSet.changes()) {

1061−#endif

10621012// qDebug() << "ListViewWithPageHeader::onModelUpdated Change" << change.index << change.count;

10631013 for (int i = change.index; i < change.count; ++i) {

10641014 ListItem *item = itemAtIndex(i);

plugins/DashViews/listviewwithpageheader.h−20

@@ -17,21 +17,13 @@

1717#ifndef LISTVIEWWITHPAGEHEADER_H

1818#define LISTVIEWWITHPAGEHEADER_H

1919

20−#pragma GCC diagnostic push

21−#pragma GCC diagnostic ignored "-pedantic"

2220#include <private/qquickitemchangelistener_p.h>

2321#include <private/qquickflickable_p.h>

24−#pragma GCC diagnostic pop

2522

2623class QAbstractItemModel;

2724class QQuickNumberAnimation;

28−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

29−class QQuickChangeSet;

30−class QQuickVisualDataModel;

31−#else

3225class QQmlChangeSet;

3326class QQmlDelegateModel;

34−#endif

3527

3628

3729/**

@@ -117,19 +109,11 @@ protected:

117109 void updatePolish();

118110

119111private Q_SLOTS:

120−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

121− void itemCreated(int modelIndex, QQuickItem *item);

122−#else

123112 void itemCreated(int modelIndex, QObject *object);

124−#endif

125113 void onContentHeightChanged();

126114 void onContentWidthChanged();

127115 void onHeightChanged();

128−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

129− void onModelUpdated(const QQuickChangeSet &changeSet, bool reset);

130−#else

131116 void onModelUpdated(const QQmlChangeSet &changeSet, bool reset);

132−#endif

133117 void onShowHeaderAnimationFinished();

134118

135119private:

@@ -168,11 +152,7 @@ private:

168152 QQuickItem *getSectionItem(int modelIndex, bool alreadyInserted);

169153 QQuickItem *getSectionItem(const QString &sectionText);

170154

171−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

172− QQuickVisualDataModel *m_delegateModel;

173−#else

174155 QQmlDelegateModel *m_delegateModel;

175−#endif

176156

177157 // Index we are waiting because we requested it asynchronously

178158 int m_asyncRequestedIndex;

plugins/DashViews/organicgrid.cpp−8

@@ -237,17 +237,9 @@ void OrganicGrid::calculateImplicitHeight()

237237 }

238238}

239239

240−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

241−void OrganicGrid::processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes)

242−#else

243240void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)

244−#endif

245241{

246−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

247− Q_FOREACH(const QQuickChangeSet::Remove &remove, removes) {

248−#else

249242 Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {

250−#endif

251243 for (int i = remove.count - 1; i >= 0; --i) {

252244 const int indexToRemove = remove.index + i;

253245 // We only support removing from the end

plugins/DashViews/organicgrid.h−4

@@ -79,11 +79,7 @@ private:

7979 void doRelayout() override;

8080 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

8181 void calculateImplicitHeight() override;

82−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

83− void processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes) override;

84−#else

8582 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;

86−#endif

8783

8884 QSizeF m_smallDelegateSize;

8985 QSizeF m_bigDelegateSize;

plugins/DashViews/verticaljournal.cpp−8

@@ -239,17 +239,9 @@ void VerticalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)

239239 }

240240}

241241

242−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

243−void VerticalJournal::processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes)

244−#else

245242void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)

246−#endif

247243{

248−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

249− Q_FOREACH(const QQuickChangeSet::Remove &remove, removes) {

250−#else

251244 Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {

252−#endif

253245 for (int i = remove.count - 1; i >= 0; --i) {

254246 const int indexToRemove = remove.index + i;

255247 // Since we only support removing from the end, indexToRemove

plugins/DashViews/verticaljournal.h−4

@@ -90,11 +90,7 @@ private:

9090 void calculateImplicitHeight() override;

9191 void doRelayout() override;

9292 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

93−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

94− void processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes) override;

95−#else

9693 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;

97−#endif

9894

9995 QVector<QList<ViewItem>> m_columnVisibleItems;

10096 QHash<int, int> m_indexColumnMap;

po/ug.po+5−5

@@ -8,14 +8,14 @@ msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

1010"POT-Creation-Date: 2014-03-25 16:48+0100\n"

11−"PO-Revision-Date: 2014-04-14 09:31+0000\n"

12−"Last-Translator: volkhan <Unknown>\n"

11+"PO-Revision-Date: 2014-04-22 05:46+0000\n"

12+"Last-Translator: abdurahman <Unknown>\n"

1313"Language-Team: Uyghur <ug@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-04-15 07:57+0000\n"

18−"X-Generator: Launchpad (build 16976)\n"

17+"X-Launchpad-Export-Date: 2014-04-23 07:07+0000\n"

18+"X-Generator: Launchpad (build 16985)\n"

1919

2020#: plugins/Unity/Launcher/launcheritem.cpp:43

2121#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -93,7 +93,7 @@ msgstr "يېقىنقى"

9393#: qml/Dash/PreviewListView.qml:52

9494#, qt-format

9595msgid "%1 Preview"

96−msgstr ""

96+msgstr "%1 ئالدىن كۆرۈپ بىقىش"

9797

9898#: qml/Dash/Previews/PreviewActionCombo.qml:34

9999msgid "More..."

tests/plugins/DashViews/listviewwithpageheadertest.cpp−15

@@ -23,11 +23,7 @@

2323#include <QtTestGui>

2424#pragma GCC diagnostic push

2525#pragma GCC diagnostic ignored "-pedantic"

26−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

27−#include <private/qquicklistmodel_p.h>

28−#else

2926#include <private/qqmllistmodel_p.h>

30−#endif

3127#include <private/qquickanimation_p.h>

3228#include <private/qquickitem_p.h>

3329#pragma GCC diagnostic pop

@@ -124,11 +120,7 @@ private Q_SLOTS:

124120 view->engine()->addImportPath(BUILT_PLUGINS_DIR);

125121 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertest.qml"));

126122 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());

127−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

128− model = view->rootObject()->findChild<QQuickListModel*>();

129−#else

130123 model = view->rootObject()->findChild<QQmlListModel*>();

131−#endif

132124 otherDelegate = view->rootObject()->findChild<QQmlComponent*>();

133125 QVERIFY(lvwph);

134126 QVERIFY(model);

@@ -1747,9 +1739,6 @@ private Q_SLOTS:

17471739

17481740 void testMaximizeVisibleAreaMoveUpAndShowHeader()

17491741 {

1750−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

1751− QSKIP("This test is extremely unstable in 5.0.x");

1752−#endif

17531742 model->setProperty(0, "size", 800);

17541743 verifyItem(0, 50., 800., false);

17551744

@@ -1913,11 +1902,7 @@ private Q_SLOTS:

19131902private:

19141903 QQuickView *view;

19151904 ListViewWithPageHeader *lvwph;

1916−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

1917− QQuickListModel *model;

1918−#else

19191905 QQmlListModel *model;

1920−#endif

19211906 QQmlComponent *otherDelegate;

19221907};

19231908

tests/plugins/DashViews/listviewwithpageheadertestsection.cpp−12

@@ -23,11 +23,7 @@

2323#include <QtTestGui>

2424#pragma GCC diagnostic push

2525#pragma GCC diagnostic ignored "-pedantic"

26−#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)

27−#include <private/qquicklistmodel_p.h>

28−#else

2926#include <private/qqmllistmodel_p.h>

30−#endif

3127#include <private/qquickanimation_p.h>

3228#include <private/qquickitem_p.h>

3329#pragma GCC diagnostic pop

@@ -135,11 +131,7 @@ private Q_SLOTS:

135131 view->engine()->addImportPath(BUILT_PLUGINS_DIR);

136132 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertestsection.qml"));

137133 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());

138−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

139− model = view->rootObject()->findChild<QQuickListModel*>();

140−#else

141134 model = view->rootObject()->findChild<QQmlListModel*>();

142−#endif

143135 otherDelegate = view->rootObject()->findChild<QQmlComponent*>();

144136 QVERIFY(lvwph);

145137 QVERIFY(model);

@@ -2156,11 +2148,7 @@ private Q_SLOTS:

21562148private:

21572149 QQuickView *view;

21582150 ListViewWithPageHeader *lvwph;

2159−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

2160− QQuickListModel *model;

2161−#else

21622151 QQmlListModel *model;

2163−#endif

21642152 QQmlComponent *otherDelegate;

21652153};

21662154

tests/plugins/DashViews/listviewwithpageheadertestsectionexternalmodel.cpp−4

@@ -24,11 +24,7 @@

2424#include <QtTestGui>

2525#pragma GCC diagnostic push

2626#pragma GCC diagnostic ignored "-pedantic"

27−#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)

28−#include <private/qquicklistmodel_p.h>

29−#else

3027#include <private/qqmllistmodel_p.h>

31−#endif

3228#include <private/qquickanimation_p.h>

3329#include <private/qquickitem_p.h>

3430#pragma GCC diagnostic pop