diff options
Diffstat (limited to 'tests')
22 files changed, 313 insertions, 62 deletions
diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt index c134c8d454..221413713e 100644 --- a/tests/.prev_CMakeLists.txt +++ b/tests/.prev_CMakeLists.txt @@ -1,6 +1,7 @@ # Generated from tests.pro. -add_subdirectory(auto) -if(QT_CONFIG___contains___release) - add_subdirectory(benchmarks) +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. endif() +qt_build_tests() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index eeddbe0780..221413713e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,12 +1,7 @@ -# special case begin -if(NOT TARGET Qt::Test) - cmake_minimum_required(VERSION 3.15.0) - project(QtDeclarativeTests VERSION 6.0.0 LANGUAGES C CXX ASM) - find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core Test Qml Quick QuickParticles - QmlDevTools QuickWidgets QmlDebug QuickTest QuickShapes - QmlWorkerScript Concurrent) - qt_set_up_standalone_tests_build() -endif() -# special case end +# Generated from tests.pro. +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. +endif() qt_build_tests() diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt new file mode 100644 index 0000000000..956a863283 --- /dev/null +++ b/tests/auto/.prev_CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from auto.pro. + +add_subdirectory(qml) +add_subdirectory(quick) +add_subdirectory(quicktest) +add_subdirectory(qmldevtools) +add_subdirectory(cmake) +add_subdirectory(installed_cmake) +add_subdirectory(toolsupport) +if(NOT APPLE_UIKIT) + add_subdirectory(qmltest) +endif() +if(TARGET Qt::Gui AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)) + add_subdirectory(particles) +endif() +if(TARGET Qt::Gui AND TARGET Qt::Widgets AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)) + add_subdirectory(quickwidgets) +endif() diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 106a7fe10e..702f646bd4 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -4,17 +4,17 @@ add_subdirectory(qml) add_subdirectory(quick) add_subdirectory(quicktest) add_subdirectory(qmldevtools) -# add_subdirectory(cmake) # special case remove # special case begin +# add_subdirectory(cmake) # add_subdirectory(installed_cmake) # special case end add_subdirectory(toolsupport) if(NOT APPLE_UIKIT) add_subdirectory(qmltest) endif() -if(QT_FEATURE_opengles2 OR QT_FEATURE_opengles3 OR (QT_FEATURE_opengl AND TARGET Qt::Gui)) +if(TARGET Qt::Gui AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)) add_subdirectory(particles) endif() -if(QT_FEATURE_opengles2 OR (QT_FEATURE_opengl AND TARGET Qt::Gui) OR (QT_FEATURE_opengles3 AND TARGET Qt::Widgets)) +if(TARGET Qt::Gui AND TARGET Qt::Widgets AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)) add_subdirectory(quickwidgets) endif() diff --git a/tests/auto/qml/.prev_CMakeLists.txt b/tests/auto/qml/.prev_CMakeLists.txt new file mode 100644 index 0000000000..3f453e4ded --- /dev/null +++ b/tests/auto/qml/.prev_CMakeLists.txt @@ -0,0 +1,82 @@ +# Generated from qml.pro. + +add_subdirectory(parserstress) +add_subdirectory(qjsvalueiterator) +add_subdirectory(qjsonbinding) +add_subdirectory(qqmlfile) +add_subdirectory(qqmlfileselector) +add_subdirectory(qqmlcomponent) +add_subdirectory(qqmlconsole) +add_subdirectory(qqmlengine) +add_subdirectory(qqmlerror) +add_subdirectory(qqmlincubator) +add_subdirectory(qqmlinfo) +add_subdirectory(qqmllistreference) +add_subdirectory(qqmllocale) +add_subdirectory(qqmlmetaobject) +add_subdirectory(qqmlmoduleplugin) +add_subdirectory(qqmlnotifier) +add_subdirectory(qqmlqt) +add_subdirectory(qqmlxmlhttprequest) +add_subdirectory(qqmlpromise) +add_subdirectory(qtqmlmodules) +add_subdirectory(qquickfolderlistmodel) +add_subdirectory(qqmlapplicationengine) +add_subdirectory(qqmlsettings) +add_subdirectory(qqmlstatemachine) +add_subdirectory(qmldiskcache) +add_subdirectory(qqmlmetatype) +if(QT_FEATURE_process AND QT_FEATURE_qml_debug) + add_subdirectory(debugger) +endif() +if(QT_FEATURE_process AND NOT boot2qt) + add_subdirectory(qmlformat) + add_subdirectory(qmllint) + add_subdirectory(qmlplugindump) +endif() +if(QT_FEATURE_library) + add_subdirectory(qqmlextensionplugin) +endif() +if(QT_FEATURE_private_tests) + add_subdirectory(qqmlcpputils) + add_subdirectory(qqmldirparser) + add_subdirectory(qmlcachegen) + add_subdirectory(animation) + add_subdirectory(qqmlecmascript) + add_subdirectory(qqmlcontext) + add_subdirectory(qqmlexpression) + add_subdirectory(qqmlglobal) + add_subdirectory(qqmllanguage) + add_subdirectory(qqmlopenmetaobject) + add_subdirectory(qqmlproperty) + add_subdirectory(qqmlpropertycache) + add_subdirectory(qqmlpropertymap) + add_subdirectory(qqmlsqldatabase) + add_subdirectory(qqmlvaluetypes) + add_subdirectory(qqmlvaluetypeproviders) + add_subdirectory(qqmlbinding) + add_subdirectory(qqmlchangeset) + add_subdirectory(qqmlconnections) + add_subdirectory(qqmllistcompositor) + add_subdirectory(qqmllistmodel) + add_subdirectory(qqmllistmodelworkerscript) + add_subdirectory(qqmlitemmodels) + add_subdirectory(qqmltypeloader) + add_subdirectory(qqmlparser) + add_subdirectory(qquickworkerscript) + add_subdirectory(qrcqml) + add_subdirectory(qqmltimer) + add_subdirectory(qqmlinstantiator) + add_subdirectory(qqmlenginecleanup) + add_subdirectory(qqmltranslation) + add_subdirectory(qqmlimport) + add_subdirectory(qqmlobjectmodel) + add_subdirectory(qqmltablemodel) + add_subdirectory(qv4assembler) + add_subdirectory(qv4mm) + add_subdirectory(qv4identifiertable) + add_subdirectory(qv4regexp) + add_subdirectory(ecmascripttests) + add_subdirectory(bindingdependencyapi) + add_subdirectory(v4misc) +endif() diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt index cccfe6105c..7592f09eba 100644 --- a/tests/auto/qml/CMakeLists.txt +++ b/tests/auto/qml/CMakeLists.txt @@ -30,6 +30,7 @@ if(QT_FEATURE_process AND QT_FEATURE_qml_debug) add_subdirectory(debugger) endif() if(QT_FEATURE_process AND NOT boot2qt) + add_subdirectory(qmlformat) add_subdirectory(qmllint) add_subdirectory(qmlplugindump) endif() diff --git a/tests/auto/qml/debugger/CMakeLists.txt b/tests/auto/qml/debugger/CMakeLists.txt index 7c0bd2e1cb..871f11820e 100644 --- a/tests/auto/qml/debugger/CMakeLists.txt +++ b/tests/auto/qml/debugger/CMakeLists.txt @@ -2,6 +2,7 @@ add_subdirectory(qqmldebugjsserver) add_subdirectory(qdebugmessageservice) +add_subdirectory(qqmldebugtranslationservice) add_subdirectory(qqmlenginedebugservice) add_subdirectory(qqmldebugjs) add_subdirectory(qqmlinspector) diff --git a/tests/auto/qml/debugger/qqmldebugtranslationservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugtranslationservice/CMakeLists.txt new file mode 100644 index 0000000000..7290b1e417 --- /dev/null +++ b/tests/auto/qml/debugger/qqmldebugtranslationservice/CMakeLists.txt @@ -0,0 +1,45 @@ +# Generated from qqmldebugtranslationservice.pro. + +##################################################################### +## tst_qdebugtranslationservice Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + data/*) +list(APPEND test_data ${test_data_glob}) + +qt_add_test(tst_qdebugtranslationservice + SOURCES + ../../../shared/util.cpp ../../../shared/util.h + ../shared/debugutil.cpp ../shared/debugutil_p.h + ../shared/qqmldebugprocess.cpp ../shared/qqmldebugprocess_p.h + tst_qqmldebugtranslationservice.cpp + INCLUDE_DIRECTORIES + ../../../shared + ../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlDebugPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qqmldebugtranslationservice.pro:<TRUE>: +# OTHER_FILES = "data/test.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qdebugtranslationservice CONDITION ANDROID OR APPLE_IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qdebugtranslationservice CONDITION NOT ANDROID AND NOT APPLE_IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/qml/ecmascripttests/CMakeLists.txt b/tests/auto/qml/ecmascripttests/CMakeLists.txt index 00357fb36b..06296fd91d 100644 --- a/tests/auto/qml/ecmascripttests/CMakeLists.txt +++ b/tests/auto/qml/ecmascripttests/CMakeLists.txt @@ -5,27 +5,20 @@ ##################################################################### add_qt_test(tst_ecmascripttests - GUI SOURCES qjstest/test262runner.cpp qjstest/test262runner.h tst_ecmascripttests.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES - Qt::QmlPrivate PUBLIC_LIBRARIES - Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 2:.:.:testcase.pro:<TRUE>: -# CONFIG = "testcase" # QT_TOOL_ENV = "checkenv" # checkenv.name = "QTEST_FUNCTION_TIMEOUT" # checkenv.value = "500000" ## Scopes: ##################################################################### - -#### Keys ignored in scope 3:.:.:testcase.pro:APPLE_OSX: -# CONFIG = "-app_bundle" add_subdirectory(qjstest) diff --git a/tests/auto/qml/qmlformat/CMakeLists.txt b/tests/auto/qml/qmlformat/CMakeLists.txt new file mode 100644 index 0000000000..483cc93aeb --- /dev/null +++ b/tests/auto/qml/qmlformat/CMakeLists.txt @@ -0,0 +1,37 @@ +# Generated from qmlformat.pro. + +##################################################################### +## tst_qmlformat Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + data/*) +list(APPEND test_data ${test_data_glob}) + +qt_add_test(tst_qmlformat + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qmlformat.cpp + DEFINES + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::Gui + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qmlformat CONDITION ANDROID OR APPLE_IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qmlformat CONDITION NOT ANDROID AND NOT APPLE_IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/qml/qmlplugindump/CMakeLists.txt b/tests/auto/qml/qmlplugindump/CMakeLists.txt index f8204d1057..a5d0eb7429 100644 --- a/tests/auto/qml/qmlplugindump/CMakeLists.txt +++ b/tests/auto/qml/qmlplugindump/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qmlplugindump - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qmlplugindump.cpp @@ -13,22 +12,14 @@ add_qt_test(tst_qmlplugindump QT_QMLTEST_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES - Qt::Gui + Qt::GuiPrivate Qt::Qml ) -#### Keys ignored in scope 2:.:.:tst_qmlplugindump.pro:<TRUE>: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -#### Keys ignored in scope 3:.:.:tst_qmlplugindump.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qmlplugindump CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt b/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt index 9508ebfa9b..c22b7485b6 100644 --- a/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt +++ b/tests/auto/qml/qqmlapplicationengine/CMakeLists.txt @@ -5,51 +5,45 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "data/*") + data/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qqmlapplicationengine - GUI SOURCES ../../shared/util.cpp ../../shared/util.h tst_qqmlapplicationengine.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui Qt::Network - Qt::Qml + Qt::QmlPrivate TESTDATA ${test_data} ) # Resources: +set(tst_qqmlapplicationengine_resource_files + "data/i18n/qml.qm" + "data/loadTranslation.qml" +) + add_qt_resource(tst_qqmlapplicationengine "tst_qqmlapplicationengine" PREFIX "/" FILES - data/i18n/qml.qm - data/loadTranslation.qml + ${tst_qqmlapplicationengine_resource_files} ) #### Keys ignored in scope 2:.:.:tst_qqmlapplicationengine.pro:<TRUE>: -# CONFIG = "testcase" # TRANSLATIONS = "data/i18n/qml_ja.ts" ## Scopes: ##################################################################### -#### Keys ignored in scope 3:.:.:tst_qqmlapplicationengine.pro:APPLE_OSX: -# CONFIG = "-app_bundle" - extend_target(tst_qqmlapplicationengine CONDITION ANDROID OR APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" diff --git a/tests/auto/qml/qqmllanguage/CMakeLists.txt b/tests/auto/qml/qqmllanguage/CMakeLists.txt index 2e2ad71601..682d35bb1b 100644 --- a/tests/auto/qml/qqmllanguage/CMakeLists.txt +++ b/tests/auto/qml/qqmllanguage/CMakeLists.txt @@ -29,6 +29,8 @@ qt_add_test(tst_qqmllanguage #### Keys ignored in scope 1:.:.:qqmllanguage.pro:<TRUE>: # OTHER_FILES = "data/readonlyObjectProperty.qml" +# QML_IMPORT_NAME = "StaticTest" +# QML_IMPORT_VERSION = "1.0" ## Scopes: ##################################################################### @@ -59,3 +61,11 @@ qt_extend_target(tst_qqmllanguage CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) + +set_target_properties(tst_qqmllanguage PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 1.0 + QT_QML_MODULE_URI StaticTest +) + +qt6_qml_type_registration(tst_qqmllanguage) diff --git a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt index 746774c593..3a1251655a 100644 --- a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt @@ -25,14 +25,11 @@ add_qt_test(tst_qqmlmoduleplugin tst_qqmlmoduleplugin.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui Qt::Network - Qt::Qml + Qt::QmlPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt index 85538c3a89..975a424475 100644 --- a/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/CMakeLists.txt @@ -25,14 +25,11 @@ add_qt_test(tst_qqmlmoduleplugin tst_qqmlmoduleplugin.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui Qt::Network - Qt::Qml + Qt::QmlPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlparser/CMakeLists.txt b/tests/auto/qml/qqmlparser/CMakeLists.txt index f6fad897ca..831fdff0e1 100644 --- a/tests/auto/qml/qqmlparser/CMakeLists.txt +++ b/tests/auto/qml/qqmlparser/CMakeLists.txt @@ -12,12 +12,13 @@ list(APPEND test_data ${test_data_glob}) qt_add_test(tst_qqmlparser SOURCES + ../../shared/qqmljsastdumper.cpp ../../shared/qqmljsastdumper.h ../../shared/util.cpp ../../shared/util.h tst_qqmlparser.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" INCLUDE_DIRECTORIES - ../../shared + ../../shared ../../shared PUBLIC_LIBRARIES Qt::Gui Qt::QmlPrivate diff --git a/tests/auto/qml/qqmlproperty/CMakeLists.txt b/tests/auto/qml/qqmlproperty/CMakeLists.txt index dbe648bd2f..5899210558 100644 --- a/tests/auto/qml/qqmlproperty/CMakeLists.txt +++ b/tests/auto/qml/qqmlproperty/CMakeLists.txt @@ -13,6 +13,7 @@ list(APPEND test_data ${test_data_glob}) qt_add_test(tst_qqmlproperty SOURCES ../../shared/util.cpp ../../shared/util.h + interfaces.h tst_qqmlproperty.cpp INCLUDE_DIRECTORIES ../../shared @@ -24,6 +25,10 @@ qt_add_test(tst_qqmlproperty TESTDATA ${test_data} ) +#### Keys ignored in scope 1:.:.:qqmlproperty.pro:<TRUE>: +# QML_IMPORT_NAME = "io.qt.bugreports" +# QML_IMPORT_VERSION = "2.0" + ## Scopes: ##################################################################### @@ -36,3 +41,11 @@ qt_extend_target(tst_qqmlproperty CONDITION NOT ANDROID AND NOT APPLE_IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) + +set_target_properties(tst_qqmlproperty PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 2.0 + QT_QML_MODULE_URI io.qt.bugreports +) + +qt6_qml_type_registration(tst_qqmlproperty) diff --git a/tests/auto/quick/.prev_CMakeLists.txt b/tests/auto/quick/.prev_CMakeLists.txt new file mode 100644 index 0000000000..488150c61c --- /dev/null +++ b/tests/auto/quick/.prev_CMakeLists.txt @@ -0,0 +1,68 @@ +# Generated from quick.pro. + +add_subdirectory(geometry) +add_subdirectory(qquickpixmapcache) +if(QT_FEATURE_private_tests) + add_subdirectory(nokeywords) + add_subdirectory(propertyrequirements) + add_subdirectory(qquickanimations) + add_subdirectory(qquickapplication) + add_subdirectory(qquickbehaviors) + add_subdirectory(qquickboundaryrule) + add_subdirectory(qquickfontloader) + add_subdirectory(qquickfontloader_static) + add_subdirectory(qquickfontmetrics) + add_subdirectory(qquickimageprovider) + add_subdirectory(qquicklayouts) + add_subdirectory(qquickpath) + add_subdirectory(qquicksmoothedanimation) + add_subdirectory(qquickspringanimation) + add_subdirectory(qquickanimationcontroller) + add_subdirectory(qquickstyledtext) + add_subdirectory(qquickstates) + add_subdirectory(qquicksystempalette) + add_subdirectory(qquicktimeline) + add_subdirectory(pointerhandlers) + add_subdirectory(qquickaccessible) + add_subdirectory(qquickanchors) + add_subdirectory(qquickanimatedimage) + add_subdirectory(qquickdynamicpropertyanimation) + add_subdirectory(qquickborderimage) + add_subdirectory(qquickwindow) + add_subdirectory(qquickdrag) + add_subdirectory(qquickdroparea) + add_subdirectory(qquickflickable) + add_subdirectory(qquickflipable) + add_subdirectory(qquickfocusscope) + add_subdirectory(qquickgraphicsinfo) + add_subdirectory(qquickgridview) + add_subdirectory(qquickimage) + add_subdirectory(qquickitem) + add_subdirectory(qquickitem2) + add_subdirectory(qquickitemlayer) + add_subdirectory(qquicklistview) + add_subdirectory(qquicktableview) + add_subdirectory(qquickloader) + add_subdirectory(qquickmousearea) + add_subdirectory(qquickmultipointtoucharea) + add_subdirectory(qquickpainteditem) + add_subdirectory(qquickshape) + add_subdirectory(qquickpathview) + add_subdirectory(qquickpincharea) + add_subdirectory(qquickpositioners) + add_subdirectory(qquickrectangle) + add_subdirectory(qquickrepeater) + add_subdirectory(qquickshortcut) + add_subdirectory(qquicktext) + add_subdirectory(qquicktextdocument) + add_subdirectory(qquicktextedit) + add_subdirectory(qquicktextinput) + add_subdirectory(qquickvisualdatamodel) + add_subdirectory(qquickview) + add_subdirectory(qquickcanvasitem) + add_subdirectory(qquickdesignersupport) + add_subdirectory(qquickscreen) + add_subdirectory(touchmouse) + add_subdirectory(scenegraph) + add_subdirectory(sharedimage) +endif() diff --git a/tests/auto/quick/pointerhandlers/CMakeLists.txt b/tests/auto/quick/pointerhandlers/CMakeLists.txt index be23ca12ad..f8ac22d531 100644 --- a/tests/auto/quick/pointerhandlers/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/CMakeLists.txt @@ -2,6 +2,7 @@ if(QT_FEATURE_private_tests) add_subdirectory(flickableinterop) + add_subdirectory(mousearea_interop) add_subdirectory(multipointtoucharea_interop) add_subdirectory(qquickdraghandler) add_subdirectory(qquickhoverhandler) diff --git a/tests/benchmarks/CMakeLists.txt b/tests/benchmarks/CMakeLists.txt index 0cc44921f4..06cce61350 100644 --- a/tests/benchmarks/CMakeLists.txt +++ b/tests/benchmarks/CMakeLists.txt @@ -2,6 +2,6 @@ add_subdirectory(qml) add_subdirectory(quick) -if(QT_FEATURE_opengles2 OR QT_FEATURE_opengles3 OR (QT_FEATURE_opengl AND QT_FEATURE_private_tests)) +if(QT_FEATURE_private_tests AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)) add_subdirectory(particles) endif() diff --git a/tests/benchmarks/qml/painting/CMakeLists.txt b/tests/benchmarks/qml/painting/CMakeLists.txt index 93ae5e9ef7..aa126450a6 100644 --- a/tests/benchmarks/qml/painting/CMakeLists.txt +++ b/tests/benchmarks/qml/painting/CMakeLists.txt @@ -10,6 +10,7 @@ qt_add_benchmark(painting PUBLIC_LIBRARIES Qt::Gui Qt::OpenGL + Qt::OpenGLWidgets Qt::Widgets ) diff --git a/tests/manual/pointer/CMakeLists.txt b/tests/manual/pointer/CMakeLists.txt index c11611ed7e..e58fc7f29f 100644 --- a/tests/manual/pointer/CMakeLists.txt +++ b/tests/manual/pointer/CMakeLists.txt @@ -47,6 +47,10 @@ set(qml_resource_files "pointerDrag.qml" "resources/arrowhead.png" "resources/balloon.png" + "resources/cursor-airbrush.png" + "resources/cursor-eraser.png" + "resources/cursor-felt-marker.png" + "resources/cursor-pencil.png" "resources/fighter.png" "resources/fingersprite.png" "resources/grabbing-location.svg" @@ -61,6 +65,7 @@ set(qml_resource_files "resources/redball.png" "sidebar.qml" "singlePointHandlerProperties.qml" + "tabletCanvasDrawing.qml" "tapHandler.qml" ) |