diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-21 14:26:07 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-21 14:08:35 +0000 |
| commit | 3be6ca63aedd12116dd0a502655c919e35f85ddc (patch) | |
| tree | 74f7ee9a68cea07b0fb1b005aa85b02ba568d2db /tests/benchmarks/objectcount/tst_objectcount.cpp | |
| parent | f70676242f9ac83549eb3772f01ff027bd28c534 (diff) | |
Tests: prepare for the upcoming import rename - part II
Move the Qt/labs/ prefix out of addTestRows().
Change-Id: I1bd69fee15e795ca40f8c767dc86be5f80f66530
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'tests/benchmarks/objectcount/tst_objectcount.cpp')
| -rw-r--r-- | tests/benchmarks/objectcount/tst_objectcount.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/benchmarks/objectcount/tst_objectcount.cpp b/tests/benchmarks/objectcount/tst_objectcount.cpp index c0b5440b..87c37955 100644 --- a/tests/benchmarks/objectcount/tst_objectcount.cpp +++ b/tests/benchmarks/objectcount/tst_objectcount.cpp @@ -124,7 +124,7 @@ static void addTestRows(QQmlEngine *engine, const QString &sourcePath, const QSt if (!skiplist.contains(name)) { foreach (const QString &importPath, engine->importPathList()) { QString name = entry.dir().dirName() + "/" + entry.fileName(); - QString filePath = importPath + "/Qt/labs/" + targetPath + "/" + entry.fileName(); + QString filePath = importPath + "/" + targetPath + "/" + entry.fileName(); if (QFile::exists(filePath)) { QTest::newRow(qPrintable(name)) << QUrl::fromLocalFile(filePath); break; @@ -165,7 +165,7 @@ void tst_ObjectCount::calendar() void tst_ObjectCount::calendar_data() { QTest::addColumn<QUrl>("url"); - addTestRows(&engine, "calendar", "calendar"); + addTestRows(&engine, "calendar", "Qt/labs/calendar"); } void tst_ObjectCount::controls() @@ -177,7 +177,7 @@ void tst_ObjectCount::controls() void tst_ObjectCount::controls_data() { QTest::addColumn<QUrl>("url"); - addTestRows(&engine, "controls", "controls", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); + addTestRows(&engine, "controls", "Qt/labs/controls", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); } void tst_ObjectCount::material() @@ -189,7 +189,7 @@ void tst_ObjectCount::material() void tst_ObjectCount::material_data() { QTest::addColumn<QUrl>("url"); - addTestRows(&engine, "controls/material", "controls/material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); + addTestRows(&engine, "controls/material", "Qt/labs/controls/material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); } void tst_ObjectCount::universal() @@ -201,7 +201,7 @@ void tst_ObjectCount::universal() void tst_ObjectCount::universal_data() { QTest::addColumn<QUrl>("url"); - addTestRows(&engine, "controls/universal", "controls/universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); + addTestRows(&engine, "controls/universal", "Qt/labs/controls/universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); } QTEST_MAIN(tst_ObjectCount) |