diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2018-03-09 15:22:08 +0100 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2018-03-09 15:16:34 +0000 |
| commit | 41a42612d69398dffa49772ef05d44d41f4bfece (patch) | |
| tree | fb9475c864b2ebebc8ffd821d541bfdc6eda186c /tests | |
| parent | 3fffa68e5827cc4b1b310912e26314cde2ba9e95 (diff) | |
| download | qtivi-41a42612d69398dffa49772ef05d44d41f4bfece.tar.gz | |
Fix linker errors with older Qt versions
Change-Id: I33e72e89d04732b798257a6fa663dcafd42af3b9
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp index db79fac..2b8ce7f 100644 --- a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp +++ b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp @@ -234,9 +234,9 @@ void ServiceManagerTest::testManagerListModel() QCOMPARE(regResult, true); QCOMPARE(manager->rowCount(), 1); //QCOMPARE(manager->data(manager->index(0), Qt::DisplayRole).value<QIviServiceInterface*>(), backend0); - QCOMPARE(manager->data(manager->index(0), QIviServiceManager::NameRole), "MockServiceBackend"); + QCOMPARE(manager->data(manager->index(0), QIviServiceManager::NameRole).toString(), QStringLiteral("MockServiceBackend")); QCOMPARE(manager->data(manager->index(0), QIviServiceManager::ServiceObjectRole).value<QIviProxyServiceObject*>()->serviceInterface(), backend0); - QCOMPARE(manager->data(manager->index(0), QIviServiceManager::InterfacesRole), QStringList() << "Interface0"); + QCOMPARE(manager->data(manager->index(0), QIviServiceManager::InterfacesRole).toStringList(), QStringList() << "Interface0"); QCOMPARE(managerModelSpy.count(), 1); // Extendend sanity check QCOMPARE(manager->data(manager->index(0,0), Qt::UserRole + 200), QVariant()); @@ -246,12 +246,12 @@ void ServiceManagerTest::testManagerListModel() regResult = manager->registerService(backend1, QStringList() << "Interface1" << "Interface2"); QCOMPARE(regResult, true); QCOMPARE(manager->rowCount(), 2); - QCOMPARE(manager->data(manager->index(0), QIviServiceManager::NameRole), "MockServiceBackend"); + QCOMPARE(manager->data(manager->index(0), QIviServiceManager::NameRole).toString(), QStringLiteral("MockServiceBackend")); QCOMPARE(manager->data(manager->index(0), QIviServiceManager::ServiceObjectRole).value<QIviProxyServiceObject*>()->serviceInterface(), backend0); - QCOMPARE(manager->data(manager->index(0), QIviServiceManager::InterfacesRole), QStringList() << "Interface0"); - QCOMPARE(manager->data(manager->index(1), QIviServiceManager::NameRole), "MockServiceBackend"); + QCOMPARE(manager->data(manager->index(0), QIviServiceManager::InterfacesRole).toStringList(), QStringList() << "Interface0"); + QCOMPARE(manager->data(manager->index(1), QIviServiceManager::NameRole).toString(), QStringLiteral("MockServiceBackend")); QCOMPARE(manager->data(manager->index(1), QIviServiceManager::ServiceObjectRole).value<QIviProxyServiceObject*>()->serviceInterface(), backend1); - QCOMPARE(manager->data(manager->index(1), QIviServiceManager::InterfacesRole), QStringList() << "Interface1" << "Interface2"); + QCOMPARE(manager->data(manager->index(1), QIviServiceManager::InterfacesRole).toStringList(), QStringList() << "Interface1" << "Interface2"); QCOMPARE(managerModelSpy.count(), 2); // Register backend-2 with 'Interface1' and 'Interface2'. Should not result in any model changes |