3f43349 · unity8 · git.iko.soy

git.iko.soy/unity8

Some more new connections i had missed

commit3f43349c7a648c3070fc87a2acd411ec1f19da82 authorAlbert Astals Cid <albert.astals@canonical.com> dateWed 19 Aug 2015, 16:24 (11 years ago) parent479eddc

14 files changed+56−56

compare with xenial

unifiedsplit

plugins/LightDM/liblightdm/Greeter.cpp+1−1 plugins/Utils/unitysortfilterproxymodelqml.cpp+3−3 tests/mocks/GSettings.1.0/fake_gsettings.cpp+4−4 tests/mocks/LightDM/liblightdm/Greeter.cpp+1−1 tests/plugins/Dash/listviewwithpageheadersectiontest.cpp+1−1 tests/plugins/Dash/listviewwithpageheadertest.cpp+1−1 tests/plugins/LightDM/dbus.cpp+5−5 tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+4−4 tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.cpp+5−5 tests/plugins/Unity/Launcher/launchermodeltest.cpp+3−3 tests/plugins/Utils/HomeKeyWatcherTest.cpp+2−2 tests/plugins/Utils/QLimitProxyModelTest.cpp+21−21 tests/plugins/Utils/UnitySortFilterProxyModelTest.cpp+4−4 tests/qmltests/Components/tst_DragHandle.cpp+1−1

plugins/LightDM/liblightdm/Greeter.cpp+1−1

@@ -175,7 +175,7 @@ void Greeter::sendAuthenticationComplete()

175175{

176176 if (qgetenv("UNITY_TESTING").isEmpty()) {

177177 // simulate PAM's delay

178− QTimer::singleShot(1000, this, SIGNAL(authenticationComplete()));

178+ QTimer::singleShot(1000, this, &Greeter::authenticationComplete);

179179 } else {

180180 Q_EMIT authenticationComplete();

181181 }

plugins/Utils/unitysortfilterproxymodelqml.cpp+3−3

@@ -59,9 +59,9 @@ UnitySortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)

5959

6060 setSourceModel(itemModel);

6161

62− connect(itemModel, SIGNAL(modelReset()), SIGNAL(totalCountChanged()));

63− connect(itemModel, SIGNAL(rowsInserted(QModelIndex,int,int)), SIGNAL(totalCountChanged()));

64− connect(itemModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), SIGNAL(totalCountChanged()));

62+ connect(itemModel, &QAbstractItemModel::modelReset, this, &UnitySortFilterProxyModelQML::totalCountChanged);

63+ connect(itemModel, &QAbstractItemModel::rowsInserted, this, &UnitySortFilterProxyModelQML::totalCountChanged);

64+ connect(itemModel, &QAbstractItemModel::rowsRemoved, this, &UnitySortFilterProxyModelQML::totalCountChanged);

6565

6666 Q_EMIT totalCountChanged();

6767 Q_EMIT modelChanged();

tests/mocks/GSettings.1.0/fake_gsettings.cpp+4−4

@@ -95,10 +95,10 @@ GSettingsQml::GSettingsQml(QObject *parent)

9595 : QObject(parent)

9696{

9797 m_schema = new GSettingsSchemaQml(this);

98− connect(GSettingsControllerQml::instance(), SIGNAL(pictureUriChanged(const QString &)),

99− this, SIGNAL(pictureUriChanged(const QString &)));

100− connect(GSettingsControllerQml::instance(), SIGNAL(usageModeChanged(const QString &)),

101− this, SIGNAL(usageModeChanged(const QString &)));

98+ connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::pictureUriChanged,

99+ this, &GSettingsQml::pictureUriChanged);

100+ connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::usageModeChanged,

101+ this, &GSettingsQml::usageModeChanged);

102102}

103103

104104GSettingsSchemaQml * GSettingsQml::schema() const {

tests/mocks/LightDM/liblightdm/Greeter.cpp+1−1

@@ -173,7 +173,7 @@ void Greeter::sendAuthenticationComplete()

173173{

174174 if (qgetenv("UNITY_TESTING").isEmpty()) {

175175 // simulate PAM's delay

176− QTimer::singleShot(1000, this, SIGNAL(authenticationComplete()));

176+ QTimer::singleShot(1000, this, &Greeter::authenticationComplete);

177177 } else {

178178 Q_EMIT authenticationComplete();

179179 }

tests/plugins/Dash/listviewwithpageheadersectiontest.cpp+1−1

@@ -2069,7 +2069,7 @@ private Q_SLOTS:

20692069

20702070 void addingRemoveItemsShouldNotChangeContentY()

20712071 {

2072− QSignalSpy spy(lvwph, SIGNAL(contentYChanged()));

2072+ QSignalSpy spy(lvwph, &ListViewWithPageHeader::contentYChanged);

20732073 QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 150), Q_ARG(QVariant, "Agressive"));

20742074 QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 1), Q_ARG(QVariant, 6));

20752075

tests/plugins/Dash/listviewwithpageheadertest.cpp+1−1

@@ -1660,7 +1660,7 @@ private Q_SLOTS:

16601660

16611661 void addingRemoveItemsShouldNotChangeContentY()

16621662 {

1663− QSignalSpy spy(lvwph, SIGNAL(contentYChanged()));

1663+ QSignalSpy spy(lvwph, &ListViewWithPageHeader::contentYChanged);

16641664 QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 150));

16651665 QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 1), Q_ARG(QVariant, 6));

16661666

tests/plugins/LightDM/dbus.cpp+5−5

@@ -94,7 +94,7 @@ private Q_SLOTS:

9494

9595 void testSetActiveEntry()

9696 {

97− QSignalSpy spy(greeter, SIGNAL(requestAuthenticationUser(QString)));

97+ QSignalSpy spy(greeter, &Greeter::requestAuthenticationUser);

9898 QDBusReply<void> reply = dbusList->call("SetActiveEntry", "has-password");

9999 QVERIFY(reply.isValid());

100100 spy.wait();

@@ -123,7 +123,7 @@ private Q_SLOTS:

123123

124124 void testActiveEntrySet()

125125 {

126− QSignalSpy spy(greeter, SIGNAL(requestAuthenticationUser(QString)));

126+ QSignalSpy spy(greeter, &Greeter::requestAuthenticationUser);

127127 QVERIFY(dbusList->setProperty("ActiveEntry", "has-password"));

128128 spy.wait();

129129

@@ -134,7 +134,7 @@ private Q_SLOTS:

134134

135135 void testActiveEntryChanged()

136136 {

137− QSignalSpy spy(this, SIGNAL(PropertiesChangedRelay(QString, QVariantMap, QStringList)));

137+ QSignalSpy spy(this, &GreeterDBusTest::PropertiesChangedRelay);

138138 greeter->authenticate("has-password");

139139 spy.wait();

140140

@@ -160,7 +160,7 @@ private Q_SLOTS:

160160

161161 void testEntryIsLockedChanged()

162162 {

163− QSignalSpy spy(this, SIGNAL(PropertiesChangedRelay(QString, QVariantMap, QStringList)));

163+ QSignalSpy spy(this, &GreeterDBusTest::PropertiesChangedRelay);

164164 greeter->authenticate("no-password");

165165

166166 // Two property changed signals will be emitted, one for the IsLocked

@@ -182,7 +182,7 @@ private Q_SLOTS:

182182 QVERIFY(!greeter->isActive());

183183 QVERIFY(!dbusMain->property("IsActive").toBool());

184184

185− QSignalSpy spy(this, SIGNAL(PropertiesChangedRelay(QString, QVariantMap, QStringList)));

185+ QSignalSpy spy(this, &GreeterDBusTest::PropertiesChangedRelay);

186186 greeter->setIsActive(true);

187187 spy.wait();

188188

tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+4−4

@@ -305,8 +305,8 @@ void tst_DirectionalDragArea::sceneXAndX()

305305

306306 sendTouchPress(0 /* timestamp */, 0 /* id */, touchScenePos);

307307

308− QSignalSpy touchXSpy(edgeDragArea, SIGNAL(touchXChanged(qreal)));

309− QSignalSpy touchSceneXSpy(edgeDragArea, SIGNAL(touchSceneXChanged(qreal)));

308+ QSignalSpy touchXSpy(edgeDragArea, &DirectionalDragArea::touchXChanged);

309+ QSignalSpy touchSceneXSpy(edgeDragArea, &DirectionalDragArea::touchSceneXChanged);

310310

311311 touchScenePos.rx() = m_view->width() / 2;

312312 sendTouchUpdate(50 /* timestamp */, 0 /* id */, touchScenePos);

@@ -334,8 +334,8 @@ void tst_DirectionalDragArea::sceneYAndY()

334334

335335 sendTouchPress(0 /* timestamp */, 0 /* id */, touchScenePos);

336336

337− QSignalSpy touchYSpy(edgeDragArea, SIGNAL(touchYChanged(qreal)));

338− QSignalSpy touchSceneYSpy(edgeDragArea, SIGNAL(touchSceneYChanged(qreal)));

337+ QSignalSpy touchYSpy(edgeDragArea, &DirectionalDragArea::touchYChanged);

338+ QSignalSpy touchSceneYSpy(edgeDragArea, &DirectionalDragArea::touchSceneYChanged);

339339

340340 touchScenePos.ry() = m_view->height() / 2;

341341 sendTouchUpdate(50 /* timestamp */, 0 /* id */, touchScenePos);

tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.cpp+5−5

@@ -64,7 +64,7 @@ void tst_PressedOutsideNotifier::touchOutsideAreaTriggersSignal()

6464 // Therefore, still outside it.

6565 QPoint touch0 = QPoint(m_blueRect->x() * 0.5, m_blueRect->y() * 0.5);

6666

67− QSignalSpy pressedOutsideSpy(m_notifier, SIGNAL(pressedOutside()));

67+ QSignalSpy pressedOutsideSpy(m_notifier, &PressedOutsideNotifier::pressedOutside);

6868

6969 QTest::touchEvent(m_view, m_device)

7070 .press(0, touch0);

@@ -82,7 +82,7 @@ void tst_PressedOutsideNotifier::touchInsideAreaHasNoEffect()

8282 QPoint touch0 = QPoint(m_blueRect->x() + m_blueRect->width()*0.5,

8383 m_blueRect->y() + m_blueRect->height()*0.5);

8484

85− QSignalSpy pressedOutsideSpy(m_notifier, SIGNAL(pressedOutside()));

85+ QSignalSpy pressedOutsideSpy(m_notifier, &PressedOutsideNotifier::pressedOutside);

8686

8787 QTest::touchEvent(m_view, m_device)

8888 .press(0, touch0);

@@ -99,7 +99,7 @@ void tst_PressedOutsideNotifier::mousePressOutsideAreaTriggersSignal()

9999{

100100 QPoint mousePos= QPoint(m_blueRect->x() * 0.5, m_blueRect->y() * 0.5);

101101

102− QSignalSpy pressedOutsideSpy(m_notifier, SIGNAL(pressedOutside()));

102+ QSignalSpy pressedOutsideSpy(m_notifier, &PressedOutsideNotifier::pressedOutside);

103103

104104 QTest::mousePress(m_view, Qt::LeftButton, 0 /*modifiers*/, mousePos);

105105

@@ -115,7 +115,7 @@ void tst_PressedOutsideNotifier::mousePresssInsideAreaHasNoEffect()

115115 QPoint mousePos = QPoint(m_blueRect->x() + m_blueRect->width()*0.5,

116116 m_blueRect->y() + m_blueRect->height()*0.5);

117117

118− QSignalSpy pressedOutsideSpy(m_notifier, SIGNAL(pressedOutside()));

118+ QSignalSpy pressedOutsideSpy(m_notifier, &PressedOutsideNotifier::pressedOutside);

119119

120120 QTest::mousePress(m_view, Qt::LeftButton, 0 /*modifiers*/, mousePos);

121121

@@ -130,7 +130,7 @@ void tst_PressedOutsideNotifier::nothingHappensWhileDisabled()

130130{

131131 QPoint touch0 = QPoint(m_blueRect->x() * 0.5, m_blueRect->y() * 0.5);

132132

133− QSignalSpy pressedOutsideSpy(m_notifier, SIGNAL(pressedOutside()));

133+ QSignalSpy pressedOutsideSpy(m_notifier, &PressedOutsideNotifier::pressedOutside);

134134

135135 m_notifier->setEnabled(false);

136136

tests/plugins/Unity/Launcher/launchermodeltest.cpp+3−3

@@ -187,7 +187,7 @@ private Q_SLOTS:

187187 }

188188

189189 void testPinning() {

190− QSignalSpy spy(launcherModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));

190+ QSignalSpy spy(launcherModel, &LauncherModel::dataChanged);

191191 QCOMPARE(launcherModel->get(0)->pinned(), false);

192192 QCOMPARE(launcherModel->get(1)->pinned(), false);

193193 launcherModel->pin(launcherModel->get(0)->appId());

@@ -424,7 +424,7 @@ private Q_SLOTS:

424424 }

425425

426426 void testCountEmblems() {

427− QSignalSpy spy(launcherModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));

427+ QSignalSpy spy(launcherModel, &LauncherModel::dataChanged);

428428

429429 // Call GetAll on abs-icon

430430 QDBusInterface interface("com.canonical.Unity.Launcher", "/com/canonical/Unity/Launcher/abs_2Dicon", "org.freedesktop.DBus.Properties");

@@ -570,7 +570,7 @@ private Q_SLOTS:

570570

571571 void testSettings() {

572572 GSettings *settings = launcherModel->m_settings;

573− QSignalSpy spy(launcherModel, SIGNAL(hint()));

573+ QSignalSpy spy(launcherModel, &LauncherModel::hint);

574574

575575 // Nothing pinned at startup

576576 QCOMPARE(settings->storedApplications().count(), 0);

tests/plugins/Utils/HomeKeyWatcherTest.cpp+2−2

@@ -128,7 +128,7 @@ void HomeKeyWatcherTest::touchTapTouch()

128128 QFETCH(int, silenceAfterTap);

129129 QFETCH(int, expectedActivatedCount);

130130 HomeKeyWatcher homeKeyWatcher(m_fakeTimerFactory->create(), new FakeElapsedTimer);

131− QSignalSpy activatedSpy(&homeKeyWatcher, SIGNAL(activated()));

131+ QSignalSpy activatedSpy(&homeKeyWatcher, &HomeKeyWatcher::activated);

132132 QVERIFY(activatedSpy.isValid());

133133

134134 {

@@ -189,7 +189,7 @@ void HomeKeyWatcherTest::touchTapTouch()

189189void HomeKeyWatcherTest::tapWhileTouching()

190190{

191191 HomeKeyWatcher homeKeyWatcher(m_fakeTimerFactory->create(), new FakeElapsedTimer);

192− QSignalSpy activatedSpy(&homeKeyWatcher, SIGNAL(activated()));

192+ QSignalSpy activatedSpy(&homeKeyWatcher, &HomeKeyWatcher::activated);

193193 QVERIFY(activatedSpy.isValid());

194194

195195 {

tests/plugins/Utils/QLimitProxyModelTest.cpp+21−21

@@ -193,7 +193,7 @@ private Q_SLOTS:

193193 MockListModel model;

194194 model.insertRows(0, 5);

195195

196− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));

196+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);

197197

198198 proxy.setModel(&model);

199199 QCOMPARE(proxy.rowCount(), 5);

@@ -207,7 +207,7 @@ private Q_SLOTS:

207207

208208 proxy.setModel(&model);

209209

210− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));

210+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);

211211

212212 model.insertRows(0, 5);

213213 QCOMPARE(proxy.rowCount(), 5);

@@ -222,7 +222,7 @@ private Q_SLOTS:

222222

223223 proxy.setModel(&model);

224224

225− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));

225+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);

226226

227227 model.removeRows(0, 3);

228228 QCOMPARE(proxy.rowCount(), 2);

@@ -237,7 +237,7 @@ private Q_SLOTS:

237237 proxy.setModel(&model);

238238 proxy.setLimit(3);

239239

240− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));

240+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);

241241

242242 model.insertRows(0, 5);

243243 QCOMPARE(proxy.rowCount(), 3);

@@ -253,9 +253,9 @@ private Q_SLOTS:

253253

254254 proxy.setModel(&model);

255255

256− QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));

257− QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));

258− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));

256+ QSignalSpy spyOnRowsRemoved(&proxy, &QLimitProxyModelQML::rowsRemoved);

257+ QSignalSpy spyOnRowsInserted(&proxy, &QLimitProxyModelQML::rowsInserted);

258+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);

259259

260260 proxy.setLimit(5);

261261 QCOMPARE(spyOnRowsInserted.count(), 0);

@@ -300,9 +300,9 @@ private Q_SLOTS:

300300

301301 proxy.setModel(&model);

302302

303− QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));

304− QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));

305− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));

303+ QSignalSpy spyOnRowsRemoved(&proxy, &QLimitProxyModelQML::rowsRemoved);

304+ QSignalSpy spyOnRowsInserted(&proxy, &QLimitProxyModelQML::rowsInserted);

305+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);

306306

307307 proxy.setLimit(7);

308308 QCOMPARE(spyOnRowsRemoved.count(), 0);

@@ -359,9 +359,9 @@ private Q_SLOTS:

359359

360360 proxy.setModel(&model);

361361

362− QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));

363− QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));

364− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));

362+ QSignalSpy spyOnRowsRemoved(&proxy, &QLimitProxyModelQML::rowsRemoved);

363+ QSignalSpy spyOnRowsInserted(&proxy, &QLimitProxyModelQML::rowsInserted);

364+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);

365365

366366 proxy.setLimit(7);

367367 QCOMPARE(spyOnRowsRemoved.count(), 0);

@@ -406,9 +406,9 @@ private Q_SLOTS:

406406 proxy.setModel(&model);

407407 proxy.setLimit(7);

408408

409− QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));

410− QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));

411− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));

409+ QSignalSpy spyOnRowsRemoved(&proxy, &QLimitProxyModelQML::rowsRemoved);

410+ QSignalSpy spyOnRowsInserted(&proxy, &QLimitProxyModelQML::rowsInserted);

411+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);

412412

413413 model.insertRows(0, 5);

414414 QCOMPARE(spyOnRowsRemoved.count(), 0);

@@ -451,9 +451,9 @@ private Q_SLOTS:

451451

452452 QCOMPARE(proxy.rowCount(), 7);

453453

454− QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));

455− QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));

456− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));

454+ QSignalSpy spyOnRowsRemoved(&proxy, &QLimitProxyModelQML::rowsRemoved);

455+ QSignalSpy spyOnRowsInserted(&proxy, &QLimitProxyModelQML::rowsInserted);

456+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);

457457

458458 model.removeRows(7, 3);

459459 QCOMPARE(proxy.rowCount(), 7);

@@ -507,7 +507,7 @@ private Q_SLOTS:

507507 QLimitProxyModelQML proxy;

508508 MockListModel model, model2;

509509

510− QSignalSpy spyOnModelChanged(&proxy, SIGNAL(modelChanged()));

510+ QSignalSpy spyOnModelChanged(&proxy, &QLimitProxyModelQML::modelChanged);

511511

512512 proxy.setModel(&model);

513513 QCOMPARE(spyOnModelChanged.count(), 1);

@@ -529,7 +529,7 @@ private Q_SLOTS:

529529 proxy.setModel(&model);

530530 proxy.setModel(&model);

531531

532− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));

532+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);

533533

534534 model.insertRows(0, 5);

535535 QCOMPARE(proxy.rowCount(), 5);

tests/plugins/Utils/UnitySortFilterProxyModelTest.cpp+4−4

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

135135 MockListModel model;

136136 model.insertRows(0, 5);

137137

138− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));

138+ QSignalSpy spyOnCountChanged(&proxy, &UnitySortFilterProxyModelQML::countChanged);

139139

140140 proxy.setModel(&model);

141141 QCOMPARE(proxy.count(), 5);

@@ -149,7 +149,7 @@ private Q_SLOTS:

149149

150150 proxy.setModel(&model);

151151

152− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));

152+ QSignalSpy spyOnCountChanged(&proxy, &UnitySortFilterProxyModelQML::countChanged);

153153

154154 model.insertRows(0, 5);

155155 QCOMPARE(proxy.count(), 5);

@@ -165,7 +165,7 @@ private Q_SLOTS:

165165 proxy.setModel(&model);

166166 QCOMPARE(proxy.count(), 5);

167167

168− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));

168+ QSignalSpy spyOnCountChanged(&proxy, &UnitySortFilterProxyModelQML::countChanged);

169169

170170 model.removeRows(0, 3);

171171 QCOMPARE(proxy.count(), 2);

@@ -249,7 +249,7 @@ private Q_SLOTS:

249249 UnitySortFilterProxyModelQML proxy;

250250 MockListModel model, model2;

251251

252− QSignalSpy spyOnModelChanged(&proxy, SIGNAL(modelChanged()));

252+ QSignalSpy spyOnModelChanged(&proxy, &UnitySortFilterProxyModelQML::modelChanged);

253253

254254 proxy.setModel(&model);

255255 QCOMPARE(spyOnModelChanged.count(), 1);

tests/qmltests/Components/tst_DragHandle.cpp+1−1

@@ -467,7 +467,7 @@ void tst_DragHandle::hintingAnimation_dontRestartAfterFinishedAndStillPressed()

467467 tryCompare([&](){ return parentItem->height(); }, hintDisplacement);

468468

469469

470− QSignalSpy parentHeightChangedSpy(parentItem, SIGNAL(heightChanged()));

470+ QSignalSpy parentHeightChangedSpy(parentItem, &QQuickItem::heightChanged);

471471

472472 drag(touchPoint, QPointF(0.0, -1.0) /*dragDirectionVector*/, 15 /*distance*/, 3 /*numSteps*/);

473473