diff options
31 files changed, 43 insertions, 42 deletions
diff --git a/tests/auto/quickcontrols2/accessibility/CMakeLists.txt b/tests/auto/quickcontrols2/accessibility/CMakeLists.txt index ba27a497..dafca24b 100644 --- a/tests/auto/quickcontrols2/accessibility/CMakeLists.txt +++ b/tests/auto/quickcontrols2/accessibility/CMakeLists.txt @@ -21,7 +21,7 @@ qt_internal_add_test(tst_accessibility ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_accessibility.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/cursor/CMakeLists.txt b/tests/auto/quickcontrols2/cursor/CMakeLists.txt index d764836e..ebb6ec8c 100644 --- a/tests/auto/quickcontrols2/cursor/CMakeLists.txt +++ b/tests/auto/quickcontrols2/cursor/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_cursor ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_cursor.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/customization/CMakeLists.txt b/tests/auto/quickcontrols2/customization/CMakeLists.txt index 56bcaf11..daa234d2 100644 --- a/tests/auto/quickcontrols2/customization/CMakeLists.txt +++ b/tests/auto/quickcontrols2/customization/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_customization ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_customization.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/CMakeLists.txt b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/CMakeLists.txt index 22e64546..220e826c 100644 --- a/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/CMakeLists.txt +++ b/tests/auto/quickcontrols2/dialogs/qquickfiledialogimpl/CMakeLists.txt @@ -11,7 +11,7 @@ qt_internal_add_test(tst_qquickfiledialogimpl ../../shared/visualtestutil.cpp ../../shared/visualtestutil.h tst_qquickfiledialogimpl.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/dialogs/qquickfontdialogimpl/CMakeLists.txt b/tests/auto/quickcontrols2/dialogs/qquickfontdialogimpl/CMakeLists.txt index 0250c64e..b631dc8b 100644 --- a/tests/auto/quickcontrols2/dialogs/qquickfontdialogimpl/CMakeLists.txt +++ b/tests/auto/quickcontrols2/dialogs/qquickfontdialogimpl/CMakeLists.txt @@ -11,7 +11,7 @@ qt_internal_add_test(tst_qquickfontdialogimpl ../../shared/visualtestutil.cpp ../../shared/visualtestutil.h tst_qquickfontdialogimpl.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/imports\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/focus/CMakeLists.txt b/tests/auto/quickcontrols2/focus/CMakeLists.txt index 6ccf461b..74738cc2 100644 --- a/tests/auto/quickcontrols2/focus/CMakeLists.txt +++ b/tests/auto/quickcontrols2/focus/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_focus ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_focus.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/font/CMakeLists.txt b/tests/auto/quickcontrols2/font/CMakeLists.txt index 219c6f6d..e7cef476 100644 --- a/tests/auto/quickcontrols2/font/CMakeLists.txt +++ b/tests/auto/quickcontrols2/font/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_font ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_font.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/palette/CMakeLists.txt b/tests/auto/quickcontrols2/palette/CMakeLists.txt index 64aa3a1c..1a00f799 100644 --- a/tests/auto/quickcontrols2/palette/CMakeLists.txt +++ b/tests/auto/quickcontrols2/palette/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_palette ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_palette.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/qquickapplicationwindow/CMakeLists.txt b/tests/auto/quickcontrols2/qquickapplicationwindow/CMakeLists.txt index d3d013ac..00cde69c 100644 --- a/tests/auto/quickcontrols2/qquickapplicationwindow/CMakeLists.txt +++ b/tests/auto/quickcontrols2/qquickapplicationwindow/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickapplicationwindow ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_qquickapplicationwindow.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/qquickcontrol/CMakeLists.txt b/tests/auto/quickcontrols2/qquickcontrol/CMakeLists.txt index dc35e030..a8e6e655 100644 --- a/tests/auto/quickcontrols2/qquickcontrol/CMakeLists.txt +++ b/tests/auto/quickcontrols2/qquickcontrol/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickcontrol ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_qquickcontrol.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/qquickdrawer/CMakeLists.txt b/tests/auto/quickcontrols2/qquickdrawer/CMakeLists.txt index a3ab2bb2..8eb1f148 100644 --- a/tests/auto/quickcontrols2/qquickdrawer/CMakeLists.txt +++ b/tests/auto/quickcontrols2/qquickdrawer/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickdrawer ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_qquickdrawer.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/qquickheaderview/CMakeLists.txt b/tests/auto/quickcontrols2/qquickheaderview/CMakeLists.txt index 6a8f0fae..a8809a84 100644 --- a/tests/auto/quickcontrols2/qquickheaderview/CMakeLists.txt +++ b/tests/auto/quickcontrols2/qquickheaderview/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickheaderview ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_qquickheaderview.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/qquickiconimage/CMakeLists.txt b/tests/auto/quickcontrols2/qquickiconimage/CMakeLists.txt index d11779bc..d6ce5fd2 100644 --- a/tests/auto/quickcontrols2/qquickiconimage/CMakeLists.txt +++ b/tests/auto/quickcontrols2/qquickiconimage/CMakeLists.txt @@ -21,7 +21,7 @@ qt_internal_add_test(tst_qquickiconimage ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_qquickiconimage.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" LIBRARIES Qt::QuickControls2ImplPrivate Qt::QuickPrivate diff --git a/tests/auto/quickcontrols2/qquickiconlabel/CMakeLists.txt b/tests/auto/quickcontrols2/qquickiconlabel/CMakeLists.txt index 42bbf91f..54bc7172 100644 --- a/tests/auto/quickcontrols2/qquickiconlabel/CMakeLists.txt +++ b/tests/auto/quickcontrols2/qquickiconlabel/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickiconlabel ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_qquickiconlabel.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" LIBRARIES Qt::QuickControls2ImplPrivate Qt::QuickPrivate diff --git a/tests/auto/quickcontrols2/qquickmaterialstyleconf/CMakeLists.txt b/tests/auto/quickcontrols2/qquickmaterialstyleconf/CMakeLists.txt index 5ccda88b..ef5c2d13 100644 --- a/tests/auto/quickcontrols2/qquickmaterialstyleconf/CMakeLists.txt +++ b/tests/auto/quickcontrols2/qquickmaterialstyleconf/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickmaterialstyleconf ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_qquickmaterialstyleconf.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/qquickmenu/CMakeLists.txt b/tests/auto/quickcontrols2/qquickmenu/CMakeLists.txt index f0cfa15d..20dcaca0 100644 --- a/tests/auto/quickcontrols2/qquickmenu/CMakeLists.txt +++ b/tests/auto/quickcontrols2/qquickmenu/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickmenu ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_qquickmenu.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/qquickmenubar/CMakeLists.txt b/tests/auto/quickcontrols2/qquickmenubar/CMakeLists.txt index 992e4306..9f3656f0 100644 --- a/tests/auto/quickcontrols2/qquickmenubar/CMakeLists.txt +++ b/tests/auto/quickcontrols2/qquickmenubar/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickmenubar ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_qquickmenubar.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/qquickninepatchimage/CMakeLists.txt b/tests/auto/quickcontrols2/qquickninepatchimage/CMakeLists.txt index 2b747492..d9a18c49 100644 --- a/tests/auto/quickcontrols2/qquickninepatchimage/CMakeLists.txt +++ b/tests/auto/quickcontrols2/qquickninepatchimage/CMakeLists.txt @@ -21,7 +21,7 @@ qt_internal_add_test(tst_qquickninepatchimage ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_qquickninepatchimage.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" LIBRARIES Qt::GuiPrivate Qt::QuickControls2Private diff --git a/tests/auto/quickcontrols2/qquickpopup/CMakeLists.txt b/tests/auto/quickcontrols2/qquickpopup/CMakeLists.txt index 12a345ec..ad0c89c9 100644 --- a/tests/auto/quickcontrols2/qquickpopup/CMakeLists.txt +++ b/tests/auto/quickcontrols2/qquickpopup/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickpopup ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_qquickpopup.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/qquickstyle/CMakeLists.txt b/tests/auto/quickcontrols2/qquickstyle/CMakeLists.txt index 6295fb4e..c1d3a30e 100644 --- a/tests/auto/quickcontrols2/qquickstyle/CMakeLists.txt +++ b/tests/auto/quickcontrols2/qquickstyle/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickstyle ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_qquickstyle.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" LIBRARIES Qt::CorePrivate Qt::GuiPrivate diff --git a/tests/auto/quickcontrols2/qquickuniversalstyleconf/CMakeLists.txt b/tests/auto/quickcontrols2/qquickuniversalstyleconf/CMakeLists.txt index f3ce48a3..ac4a70d3 100644 --- a/tests/auto/quickcontrols2/qquickuniversalstyleconf/CMakeLists.txt +++ b/tests/auto/quickcontrols2/qquickuniversalstyleconf/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_qquickuniversalstyleconf ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_qquickuniversalstyleconf.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/sanity/CMakeLists.txt b/tests/auto/quickcontrols2/sanity/CMakeLists.txt index cbd3e2cc..c0d773b2 100644 --- a/tests/auto/quickcontrols2/sanity/CMakeLists.txt +++ b/tests/auto/quickcontrols2/sanity/CMakeLists.txt @@ -11,7 +11,7 @@ qt_internal_add_test(tst_sanity ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_sanity.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/sanity/tst_sanity.cpp b/tests/auto/quickcontrols2/sanity/tst_sanity.cpp index 9678990d..ecbcf8de 100644 --- a/tests/auto/quickcontrols2/sanity/tst_sanity.cpp +++ b/tests/auto/quickcontrols2/sanity/tst_sanity.cpp @@ -171,10 +171,11 @@ void tst_Sanity::initTestCase() // Then, collect the files from each installed style directory. const QVector<QPair<QString, QString>> styleRelativePaths = { - { "quickcontrols2/basic", "QtQuick/Controls/Basic" }, - { "quickcontrols2/fusion", "QtQuick/Controls/Fusion" }, - { "quickcontrols2/material", "QtQuick/Controls/Material" }, - { "quickcontrols2/universal", "QtQuick/Controls/Universal" }, + { "basic", "QtQuick/Controls/Basic" }, + { "fusion", "QtQuick/Controls/Fusion" }, + { "material", "QtQuick/Controls/Material" }, + { "universal", "QtQuick/Controls/Universal" }, + // TODO: add native styles: QTBUG-87108 }; for (const auto &stylePathPair : styleRelativePaths) { forEachControl(&engine, stylePathPair.first, stylePathPair.second, QStringList(), diff --git a/tests/auto/quickcontrols2/styleimports/CMakeLists.txt b/tests/auto/quickcontrols2/styleimports/CMakeLists.txt index 9e612bc7..67012c1d 100644 --- a/tests/auto/quickcontrols2/styleimports/CMakeLists.txt +++ b/tests/auto/quickcontrols2/styleimports/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_styleimports ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_styleimports.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/styleimportscompiletimematerial/CMakeLists.txt b/tests/auto/quickcontrols2/styleimportscompiletimematerial/CMakeLists.txt index 0861ffa2..06a8fe66 100644 --- a/tests/auto/quickcontrols2/styleimportscompiletimematerial/CMakeLists.txt +++ b/tests/auto/quickcontrols2/styleimportscompiletimematerial/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_styleimportscompiletimematerial ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_styleimportscompiletimematerial.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/CMakeLists.txt b/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/CMakeLists.txt index d4bb0c1b..2e5c8066 100644 --- a/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/CMakeLists.txt +++ b/tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_styleimportscompiletimeqmlonly ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_styleimportscompiletimeqmlonly.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/auto/quickcontrols2/translation/CMakeLists.txt b/tests/auto/quickcontrols2/translation/CMakeLists.txt index efb0ab6e..e21dc999 100644 --- a/tests/auto/quickcontrols2/translation/CMakeLists.txt +++ b/tests/auto/quickcontrols2/translation/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_translation ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_translation.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/benchmarks/quickcontrols2/creationtime/CMakeLists.txt b/tests/benchmarks/quickcontrols2/creationtime/CMakeLists.txt index 384eb701..d7dcb3da 100644 --- a/tests/benchmarks/quickcontrols2/creationtime/CMakeLists.txt +++ b/tests/benchmarks/quickcontrols2/creationtime/CMakeLists.txt @@ -11,7 +11,7 @@ qt_internal_add_test(tst_creationtime ../../../auto/quickcontrols2/shared/visualtestutil.cpp ../../../auto/quickcontrols2/shared/visualtestutil.h tst_creationtime.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/benchmarks/quickcontrols2/creationtime/tst_creationtime.cpp b/tests/benchmarks/quickcontrols2/creationtime/tst_creationtime.cpp index 1c36ce8a..55779662 100644 --- a/tests/benchmarks/quickcontrols2/creationtime/tst_creationtime.cpp +++ b/tests/benchmarks/quickcontrols2/creationtime/tst_creationtime.cpp @@ -111,7 +111,7 @@ void tst_CreationTime::basicStyle() void tst_CreationTime::basicStyle_data() { QTest::addColumn<QUrl>("url"); - addTestRowForEachControl(styleHelper.engine.data(), "quickcontrols2/basic", "QtQuick/Controls/Basic", QStringList() << "ApplicationWindow"); + addTestRowForEachControl(styleHelper.engine.data(), "basic", "QtQuick/Controls/Basic", QStringList() << "ApplicationWindow"); } void tst_CreationTime::fusion() @@ -123,7 +123,7 @@ void tst_CreationTime::fusion() void tst_CreationTime::fusion_data() { QTest::addColumn<QUrl>("url"); - addTestRowForEachControl(styleHelper.engine.data(), "quickcontrols2/fusion", "QtQuick/Controls/Fusion", QStringList() << "ApplicationWindow" << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator"); + addTestRowForEachControl(styleHelper.engine.data(), "fusion", "QtQuick/Controls/Fusion", QStringList() << "ApplicationWindow" << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator"); } void tst_CreationTime::imagine() @@ -135,7 +135,7 @@ void tst_CreationTime::imagine() void tst_CreationTime::imagine_data() { QTest::addColumn<QUrl>("url"); - addTestRowForEachControl(styleHelper.engine.data(), "quickcontrols2/imagine", "QtQuick/Controls/Imagine", QStringList() << "ApplicationWindow"); + addTestRowForEachControl(styleHelper.engine.data(), "imagine", "QtQuick/Controls/Imagine", QStringList() << "ApplicationWindow"); } void tst_CreationTime::material() @@ -147,7 +147,7 @@ void tst_CreationTime::material() void tst_CreationTime::material_data() { QTest::addColumn<QUrl>("url"); - addTestRowForEachControl(styleHelper.engine.data(), "quickcontrols2/material", "QtQuick/Controls/Material", QStringList() << "ApplicationWindow" << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); + addTestRowForEachControl(styleHelper.engine.data(), "material", "QtQuick/Controls/Material", QStringList() << "ApplicationWindow" << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); } void tst_CreationTime::universal() @@ -159,7 +159,7 @@ void tst_CreationTime::universal() void tst_CreationTime::universal_data() { QTest::addColumn<QUrl>("url"); - addTestRowForEachControl(styleHelper.engine.data(), "quickcontrols2/universal", "QtQuick/Controls/Universal", QStringList() << "ApplicationWindow" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); + addTestRowForEachControl(styleHelper.engine.data(), "universal", "QtQuick/Controls/Universal", QStringList() << "ApplicationWindow" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); } QTEST_MAIN(tst_CreationTime) diff --git a/tests/benchmarks/quickcontrols2/objectcount/CMakeLists.txt b/tests/benchmarks/quickcontrols2/objectcount/CMakeLists.txt index d3c933a7..1d685fc7 100644 --- a/tests/benchmarks/quickcontrols2/objectcount/CMakeLists.txt +++ b/tests/benchmarks/quickcontrols2/objectcount/CMakeLists.txt @@ -11,7 +11,7 @@ qt_internal_add_test(tst_objectcount ../../../auto/quickcontrols2/shared/visualtestutil.cpp ../../../auto/quickcontrols2/shared/visualtestutil.h tst_objectcount.cpp DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols2\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui diff --git a/tests/benchmarks/quickcontrols2/objectcount/tst_objectcount.cpp b/tests/benchmarks/quickcontrols2/objectcount/tst_objectcount.cpp index d7f1b0ef..bbcb24ca 100644 --- a/tests/benchmarks/quickcontrols2/objectcount/tst_objectcount.cpp +++ b/tests/benchmarks/quickcontrols2/objectcount/tst_objectcount.cpp @@ -93,11 +93,11 @@ void tst_ObjectCount::cleanup() static void initTestRows(QQmlEngine *engine) { - addTestRowForEachControl(engine, "quickcontrols2/basic", "QtQuick/Controls/Basic"); - addTestRowForEachControl(engine, "quickcontrols2/fusion", "QtQuick/Controls/Fusion", QStringList() << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator"); - addTestRowForEachControl(engine, "quickcontrols2/imagine", "QtQuick/Controls/Imagine"); - addTestRowForEachControl(engine, "quickcontrols2/material", "QtQuick/Controls/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); - addTestRowForEachControl(engine, "quickcontrols2/universal", "QtQuick/Controls/Universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); + addTestRowForEachControl(engine, "basic", "QtQuick/Controls/Basic"); + addTestRowForEachControl(engine, "fusion", "QtQuick/Controls/Fusion", QStringList() << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator"); + addTestRowForEachControl(engine, "imagine", "QtQuick/Controls/Imagine"); + addTestRowForEachControl(engine, "material", "QtQuick/Controls/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); + addTestRowForEachControl(engine, "universal", "QtQuick/Controls/Universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); } template <typename T> |