diff options
Diffstat (limited to 'tests/auto/quick')
122 files changed, 3937 insertions, 71 deletions
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/CMakeLists.txt b/tests/auto/quick/CMakeLists.txt new file mode 100644 index 0000000000..6cb3c23334 --- /dev/null +++ b/tests/auto/quick/CMakeLists.txt @@ -0,0 +1,70 @@ +# 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) # skip building until fixed in dev # special case + 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) # skip building until fixed in dev # special case + 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) # skip building until fixed in dev # special case + add_subdirectory(scenegraph) + add_subdirectory(sharedimage) + add_subdirectory(qquickcolorgroup) + add_subdirectory(qquickpalette) +endif() diff --git a/tests/auto/quick/drawingmodes/CMakeLists.txt b/tests/auto/quick/drawingmodes/CMakeLists.txt new file mode 100644 index 0000000000..e225df5424 --- /dev/null +++ b/tests/auto/quick/drawingmodes/CMakeLists.txt @@ -0,0 +1,42 @@ +# Generated from drawingmodes.pro. + +##################################################################### +## tst_drawingmodes 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_drawingmodes + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_drawingmodes.cpp + DEFINES + QT_DISABLE_DEPRECATED_BEFORE=0 + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::Gui + Qt::Qml + Qt::Quick + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:drawingmodes.pro:<TRUE>: +# OTHER_FILES = "data/DrawingModes.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_drawingmodes CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_drawingmodes CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/drawingmodes/tst_drawingmodes.cpp b/tests/auto/quick/drawingmodes/tst_drawingmodes.cpp index 5d69bf3b21..e982410f89 100644 --- a/tests/auto/quick/drawingmodes/tst_drawingmodes.cpp +++ b/tests/auto/quick/drawingmodes/tst_drawingmodes.cpp @@ -34,7 +34,7 @@ #include <QtQuick/qsggeometry.h> #include <QtQuick/qsgflatcolormaterial.h> #include <QtGui/qscreen.h> -#include <QtGui/qopenglcontext.h> +#include <qopenglcontext.h> #include "../../shared/util.h" diff --git a/tests/auto/quick/examples/CMakeLists.txt b/tests/auto/quick/examples/CMakeLists.txt new file mode 100644 index 0000000000..74efa0ad40 --- /dev/null +++ b/tests/auto/quick/examples/CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from examples.pro. + +##################################################################### +## tst_examples Test: +##################################################################### + +qt_add_test(tst_examples + SOURCES + tst_examples.cpp + DEFINES + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate +) + +#### Keys ignored in scope 1:.:.:examples.pro:<TRUE>: +# testcase.timeout = "400" + +## Scopes: +##################################################################### diff --git a/tests/auto/quick/geometry/CMakeLists.txt b/tests/auto/quick/geometry/CMakeLists.txt new file mode 100644 index 0000000000..5a791a8a9e --- /dev/null +++ b/tests/auto/quick/geometry/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from geometry.pro. + +##################################################################### +## tst_geometry Test: +##################################################################### + +qt_add_test(tst_geometry + SOURCES + tst_geometry.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate +) + +## Scopes: +##################################################################### diff --git a/tests/auto/quick/nodes/CMakeLists.txt b/tests/auto/quick/nodes/CMakeLists.txt new file mode 100644 index 0000000000..825442479f --- /dev/null +++ b/tests/auto/quick/nodes/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from nodes.pro. + +##################################################################### +## tst_nodestest Test: +##################################################################### + +qt_add_test(tst_nodestest + SOURCES + tst_nodestest.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate +) + +## Scopes: +##################################################################### diff --git a/tests/auto/quick/nodes/tst_nodestest.cpp b/tests/auto/quick/nodes/tst_nodestest.cpp index 249ecd5aa5..1b2b355596 100644 --- a/tests/auto/quick/nodes/tst_nodestest.cpp +++ b/tests/auto/quick/nodes/tst_nodestest.cpp @@ -30,7 +30,7 @@ #include <QtTest/QtTest> #include <QtGui/QOffscreenSurface> -#include <QtGui/QOpenGLContext> +#include <QOpenGLContext> #include <QtQuick/qsgnode.h> #include <QtQuick/private/qsgbatchrenderer_p.h> #include <QtQuick/private/qsgnodeupdater_p.h> diff --git a/tests/auto/quick/nokeywords/CMakeLists.txt b/tests/auto/quick/nokeywords/CMakeLists.txt new file mode 100644 index 0000000000..bdf29817c0 --- /dev/null +++ b/tests/auto/quick/nokeywords/CMakeLists.txt @@ -0,0 +1,25 @@ +# Generated from nokeywords.pro. + +##################################################################### +## tst_nokeywords Test: +##################################################################### + +qt_add_test(tst_nokeywords + SOURCES + tst_nokeywords.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::Quick + Qt::QuickPrivate +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_nokeywords CONDITION QT_FEATURE_opengl + LIBRARIES + Qt::OpenGLPrivate +) diff --git a/tests/auto/quick/nokeywords/nokeywords.pro b/tests/auto/quick/nokeywords/nokeywords.pro index 6872dac22a..69e1abe43e 100644 --- a/tests/auto/quick/nokeywords/nokeywords.pro +++ b/tests/auto/quick/nokeywords/nokeywords.pro @@ -7,3 +7,5 @@ SOURCES += tst_nokeywords.cpp CONFIG+=parallel_test QT += quick core-private gui-private qml-private quick-private testlib +qtConfig(opengl): \ + QT_PRIVATE += opengl-private diff --git a/tests/auto/quick/pointerhandlers/CMakeLists.txt b/tests/auto/quick/pointerhandlers/CMakeLists.txt new file mode 100644 index 0000000000..f8ac22d531 --- /dev/null +++ b/tests/auto/quick/pointerhandlers/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from pointerhandlers.pro. + +if(QT_FEATURE_private_tests) + add_subdirectory(flickableinterop) + add_subdirectory(mousearea_interop) + add_subdirectory(multipointtoucharea_interop) + add_subdirectory(qquickdraghandler) + add_subdirectory(qquickhoverhandler) + add_subdirectory(qquickpinchhandler) + add_subdirectory(qquickpointerhandler) + add_subdirectory(qquickpointhandler) + add_subdirectory(qquicktaphandler) + add_subdirectory(qquickwheelhandler) +endif() diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt new file mode 100644 index 0000000000..0d6cc7b58b --- /dev/null +++ b/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt @@ -0,0 +1,47 @@ +# Generated from flickableinterop.pro. + +##################################################################### +## tst_flickableinterop 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_flickableinterop + SOURCES + ../../../shared/util.cpp ../../../shared/util.h + ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h + ../../shared/viewtestutil.cpp ../../shared/viewtestutil.h + ../../shared/visualtestutil.cpp ../../shared/visualtestutil.h + tst_flickableinterop.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:flickableinterop.pro:<TRUE>: +# OTHER_FILES = "data/flickableWithHandlers.qml" "data/Slider.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_flickableinterop CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_flickableinterop CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt new file mode 100644 index 0000000000..8868ccdbbc --- /dev/null +++ b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt @@ -0,0 +1,47 @@ +# Generated from multipointtoucharea_interop.pro. + +##################################################################### +## tst_multipointtoucharea_interop 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_multipointtoucharea_interop + SOURCES + ../../../shared/util.cpp ../../../shared/util.h + ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h + ../../shared/viewtestutil.cpp ../../shared/viewtestutil.h + ../../shared/visualtestutil.cpp ../../shared/visualtestutil.h + tst_multipointtoucharea_interop.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:multipointtoucharea_interop.pro:<TRUE>: +# OTHER_FILES = "data/pinchDragMPTA.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_multipointtoucharea_interop CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_multipointtoucharea_interop CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt new file mode 100644 index 0000000000..825260f53d --- /dev/null +++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt @@ -0,0 +1,47 @@ +# Generated from qquickdraghandler.pro. + +##################################################################### +## tst_qquickdraghandler 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_qquickdraghandler + SOURCES + ../../../shared/util.cpp ../../../shared/util.h + ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h + ../../shared/viewtestutil.cpp ../../shared/viewtestutil.h + ../../shared/visualtestutil.cpp ../../shared/visualtestutil.h + tst_qquickdraghandler.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickdraghandler.pro:<TRUE>: +# OTHER_FILES = "data/DragAnywhereSlider.qml" "data/FlashAnimation.qml" "data/Slider.qml" "data/draggables.qml" "data/grabberstate.qml" "data/multipleSliders.qml" "data/reparenting.qml" "data/snapMode.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickdraghandler CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickdraghandler CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/pointerhandlers/qquickhoverhandler/BLACKLIST b/tests/auto/quick/pointerhandlers/qquickhoverhandler/BLACKLIST new file mode 100644 index 0000000000..9bb35c4770 --- /dev/null +++ b/tests/auto/quick/pointerhandlers/qquickhoverhandler/BLACKLIST @@ -0,0 +1,3 @@ +[movingItemWithHoverHandler] +macos # Can't move cursor (QTBUG-76312) + diff --git a/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt new file mode 100644 index 0000000000..7ff86c7c6e --- /dev/null +++ b/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt @@ -0,0 +1,47 @@ +# Generated from qquickhoverhandler.pro. + +##################################################################### +## tst_qquickhoverhandler 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_qquickhoverhandler + SOURCES + ../../../shared/util.cpp ../../../shared/util.h + ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h + ../../shared/viewtestutil.cpp ../../shared/viewtestutil.h + ../../shared/visualtestutil.cpp ../../shared/visualtestutil.h + tst_qquickhoverhandler.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickhoverhandler.pro:<TRUE>: +# OTHER_FILES = "data/lesHoverables.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickhoverhandler CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickhoverhandler CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt new file mode 100644 index 0000000000..110948c4ee --- /dev/null +++ b/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt @@ -0,0 +1,47 @@ +# Generated from qquickpinchhandler.pro. + +##################################################################### +## tst_qquickpinchhandler 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_qquickpinchhandler + SOURCES + ../../../shared/util.cpp ../../../shared/util.h + ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h + ../../shared/viewtestutil.cpp ../../shared/viewtestutil.h + ../../shared/visualtestutil.cpp ../../shared/visualtestutil.h + tst_qquickpinchhandler.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickpinchhandler.pro:<TRUE>: +# OTHER_FILES = "data/pinchproperties.qml" "data/threeFingers.qml" "data/transformedPinchArea.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickpinchhandler CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickpinchhandler CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt new file mode 100644 index 0000000000..7da285b4ce --- /dev/null +++ b/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt @@ -0,0 +1,44 @@ +# Generated from qquickpointerhandler.pro. + +##################################################################### +## tst_qquickpointerhandler 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_qquickpointerhandler + SOURCES + ../../../shared/util.cpp ../../../shared/util.h + ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h + ../../shared/viewtestutil.cpp ../../shared/viewtestutil.h + ../../shared/visualtestutil.cpp ../../shared/visualtestutil.h + tst_qquickpointerhandler.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickpointerhandler CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickpointerhandler CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt new file mode 100644 index 0000000000..51312f1db3 --- /dev/null +++ b/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt @@ -0,0 +1,47 @@ +# Generated from qquickpointhandler.pro. + +##################################################################### +## tst_qquickpointhandler 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_qquickpointhandler + SOURCES + ../../../shared/util.cpp ../../../shared/util.h + ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h + ../../shared/viewtestutil.cpp ../../shared/viewtestutil.h + ../../shared/visualtestutil.cpp ../../shared/visualtestutil.h + tst_qquickpointhandler.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickpointhandler.pro:<TRUE>: +# OTHER_FILES = "data/pointTracker.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickpointhandler CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickpointhandler CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt new file mode 100644 index 0000000000..97c8106931 --- /dev/null +++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt @@ -0,0 +1,44 @@ +# Generated from qquicktaphandler.pro. + +##################################################################### +## tst_qquicktaphandler 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_qquicktaphandler + SOURCES + ../../../shared/util.cpp ../../../shared/util.h + ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h + ../../shared/viewtestutil.cpp ../../shared/viewtestutil.h + ../../shared/visualtestutil.cpp ../../shared/visualtestutil.h + tst_qquicktaphandler.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquicktaphandler CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquicktaphandler CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/pointerhandlers/qquickwheelhandler/BLACKLIST b/tests/auto/quick/pointerhandlers/qquickwheelhandler/BLACKLIST new file mode 100644 index 0000000000..2949d3371f --- /dev/null +++ b/tests/auto/quick/pointerhandlers/qquickwheelhandler/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-81993 +[singleHandler] +macos ci diff --git a/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt new file mode 100644 index 0000000000..32d7ce9398 --- /dev/null +++ b/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt @@ -0,0 +1,47 @@ +# Generated from qquickwheelhandler.pro. + +##################################################################### +## tst_qquickwheelhandler 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_qquickwheelhandler + SOURCES + ../../../shared/util.cpp ../../../shared/util.h + ../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h + ../../shared/viewtestutil.cpp ../../shared/viewtestutil.h + ../../shared/visualtestutil.cpp ../../shared/visualtestutil.h + tst_qquickwheelhandler.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickwheelhandler.pro:<TRUE>: +# OTHER_FILES = "data/rectWheel.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickwheelhandler CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickwheelhandler CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/propertyrequirements/CMakeLists.txt b/tests/auto/quick/propertyrequirements/CMakeLists.txt new file mode 100644 index 0000000000..2a37646920 --- /dev/null +++ b/tests/auto/quick/propertyrequirements/CMakeLists.txt @@ -0,0 +1,16 @@ +# Generated from propertyrequirements.pro. + +##################################################################### +## tst_propertyrequirements Test: +##################################################################### + +qt_add_test(tst_propertyrequirements + SOURCES + tst_propertyrequirements.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::QmlPrivate +) + +## Scopes: +##################################################################### diff --git a/tests/auto/quick/qquickaccessible/CMakeLists.txt b/tests/auto/quick/qquickaccessible/CMakeLists.txt new file mode 100644 index 0000000000..e6a34e0d3f --- /dev/null +++ b/tests/auto/quick/qquickaccessible/CMakeLists.txt @@ -0,0 +1,43 @@ +# Generated from qquickaccessible.pro. + +##################################################################### +## tst_qquickaccessible 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_qquickaccessible + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickaccessible.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickaccessible.pro:<TRUE>: +# OTHER_FILES = "data/checkbuttons.qml" "data/hittest.qml" "data/pushbutton.qml" "data/statictext.qml" "data/ignored.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickaccessible CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickaccessible CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickanchors/CMakeLists.txt b/tests/auto/quick/qquickanchors/CMakeLists.txt new file mode 100644 index 0000000000..04065b9057 --- /dev/null +++ b/tests/auto/quick/qquickanchors/CMakeLists.txt @@ -0,0 +1,44 @@ +# Generated from qquickanchors.pro. + +##################################################################### +## tst_qquickanchors 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_qquickanchors + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickanchors.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickanchors CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickanchors CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickanimatedimage/CMakeLists.txt b/tests/auto/quick/qquickanimatedimage/CMakeLists.txt new file mode 100644 index 0000000000..ea18c9b5a5 --- /dev/null +++ b/tests/auto/quick/qquickanimatedimage/CMakeLists.txt @@ -0,0 +1,41 @@ +# Generated from qquickanimatedimage.pro. + +##################################################################### +## tst_qquickanimatedimage 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_qquickanimatedimage + SOURCES + ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h + ../../shared/util.cpp ../../shared/util.h + tst_qquickanimatedimage.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickanimatedimage CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickanimatedimage CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt b/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt new file mode 100644 index 0000000000..3165a91673 --- /dev/null +++ b/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt @@ -0,0 +1,44 @@ +# Generated from qquickanimatedsprite.pro. + +##################################################################### +## tst_qquickanimatedsprite 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_qquickanimatedsprite + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickanimatedsprite.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlPrivate + Qt::QuickPrivate + Qt::QuickTest + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickanimatedsprite.pro:<TRUE>: +# OTHER_FILES = "data/*.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickanimatedsprite CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickanimatedsprite CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp b/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp index 9f616c56e2..47d6008c28 100644 --- a/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp +++ b/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp @@ -34,8 +34,8 @@ #include <private/qquickitem_p.h> #include <QtCore/qscopedpointer.h> #include <QtGui/qpainter.h> -#include <QtGui/qopenglcontext.h> -#include <QtGui/qopenglfunctions.h> +#include <qopenglcontext.h> +#include <qopenglfunctions.h> #include <QtGui/qoffscreensurface.h> #include <QtQml/qqmlproperty.h> diff --git a/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt b/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt new file mode 100644 index 0000000000..f958f9272e --- /dev/null +++ b/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt @@ -0,0 +1,27 @@ +# Generated from qquickanimationcontroller.pro. + +##################################################################### +## tst_qquickanimationcontroller 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_qquickanimationcontroller + GUI + QMLTEST + SOURCES + tst_qquickanimationcontroller.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickanimationcontroller.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/auto/quick/qquickanimations/BLACKLIST b/tests/auto/quick/qquickanimations/BLACKLIST new file mode 100644 index 0000000000..a1b8557128 --- /dev/null +++ b/tests/auto/quick/qquickanimations/BLACKLIST @@ -0,0 +1,2 @@ +[simplePath] +macos ci diff --git a/tests/auto/quick/qquickanimations/CMakeLists.txt b/tests/auto/quick/qquickanimations/CMakeLists.txt new file mode 100644 index 0000000000..e0f9d38f90 --- /dev/null +++ b/tests/auto/quick/qquickanimations/CMakeLists.txt @@ -0,0 +1,45 @@ +# Generated from qquickanimations.pro. + +##################################################################### +## tst_qquickanimations 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_qquickanimations + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickanimations.cpp + DEFINES + QT_DISABLE_DEPRECATED_BEFORE=0 + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlModelsPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickanimations.pro:<TRUE>: +# OTHER_FILES = "data/animationJobSelfDestructionBug.qml" "data/attached.qml" "data/badproperty1.qml" "data/badproperty2.qml" "data/badtype1.qml" "data/badtype2.qml" "data/badtype3.qml" "data/badtype4.qml" "data/disabledTransition.qml" "data/dontAutoStart.qml" "data/dontStart.qml" "data/dontStart2.qml" "data/dotproperty.qml" "data/Double.qml" "data/doubleRegistrationBug.qml" "data/fastFlickingBug.qml" "data/looping.qml" "data/mixedtype1.qml" "data/mixedtype2.qml" "data/nonTransitionBug.qml" "data/parallelAnimationNullChildBug.qml" "data/pathAnimation.qml" "data/pathAnimation2.qml" "data/pathAnimationInOutBackCrash.qml" "data/pathAnimationNoStart.qml" "data/pathInterpolator.qml" "data/pathInterpolatorBack.qml" "data/pathInterpolatorBack2.qml" "data/pathTransition.qml" "data/pauseBindingBug.qml" "data/pauseBug.qml" "data/properties.qml" "data/properties2.qml" "data/properties3.qml" "data/properties4.qml" "data/properties5.qml" "data/propertiesTransition.qml" "data/propertiesTransition2.qml" "data/propertiesTransition3.qml" "data/propertiesTransition4.qml" "data/propertiesTransition5.qml" "data/propertiesTransition6.qml" "data/propertiesTransition7.qml" "data/reanchor.qml" "data/registrationBug.qml" "data/reparent.qml" "data/rotation.qml" "data/runningTrueBug.qml" "data/scriptActionBug.qml" "data/scriptActionCrash.qml" "data/sequentialAnimationNullChildBug.qml" "data/signals.qml" "data/transitionAssignmentBug.qml" "data/valuesource.qml" "data/valuesource2.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickanimations CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickanimations CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickanimators/CMakeLists.txt b/tests/auto/quick/qquickanimators/CMakeLists.txt new file mode 100644 index 0000000000..e0a9fa9029 --- /dev/null +++ b/tests/auto/quick/qquickanimators/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from qquickanimators.pro. + +##################################################################### +## tst_qquickanimators Test: +##################################################################### + +qt_add_test(tst_qquickanimators + SOURCES + tst_qquickanimators.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate +) + +## Scopes: +##################################################################### diff --git a/tests/auto/quick/qquickapplication/CMakeLists.txt b/tests/auto/quick/qquickapplication/CMakeLists.txt new file mode 100644 index 0000000000..b26bb64b09 --- /dev/null +++ b/tests/auto/quick/qquickapplication/CMakeLists.txt @@ -0,0 +1,44 @@ +# Generated from qquickapplication.pro. + +##################################################################### +## tst_qquickapplication 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_qquickapplication + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickapplication.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Qml + Qt::QmlPrivate + Qt::Quick + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickapplication.pro:<TRUE>: +# OTHER_FILES = "data/tst_displayname.qml" "data/tst_platformname.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickapplication CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickapplication CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickbehaviors/CMakeLists.txt b/tests/auto/quick/qquickbehaviors/CMakeLists.txt new file mode 100644 index 0000000000..f305fb030f --- /dev/null +++ b/tests/auto/quick/qquickbehaviors/CMakeLists.txt @@ -0,0 +1,42 @@ +# Generated from qquickbehaviors.pro. + +##################################################################### +## tst_qquickbehaviors 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_qquickbehaviors + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickbehaviors.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickbehaviors.pro:<TRUE>: +# DISTFILES = "data/*" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickbehaviors CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickbehaviors CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickborderimage/CMakeLists.txt b/tests/auto/quick/qquickborderimage/CMakeLists.txt new file mode 100644 index 0000000000..9bcb99befa --- /dev/null +++ b/tests/auto/quick/qquickborderimage/CMakeLists.txt @@ -0,0 +1,46 @@ +# Generated from qquickborderimage.pro. + +##################################################################### +## tst_qquickborderimage 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_qquickborderimage + SOURCES + ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickborderimage.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickborderimage CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickborderimage CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickboundaryrule/CMakeLists.txt b/tests/auto/quick/qquickboundaryrule/CMakeLists.txt new file mode 100644 index 0000000000..5fc6d1c2f0 --- /dev/null +++ b/tests/auto/quick/qquickboundaryrule/CMakeLists.txt @@ -0,0 +1,45 @@ +# Generated from qquickboundaryrule.pro. + +##################################################################### +## tst_qquickboundaryrule 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_qquickboundaryrule + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickboundaryrule.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Qml + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickboundaryrule CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickboundaryrule CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickcanvasitem/CMakeLists.txt b/tests/auto/quick/qquickcanvasitem/CMakeLists.txt new file mode 100644 index 0000000000..0c935891b4 --- /dev/null +++ b/tests/auto/quick/qquickcanvasitem/CMakeLists.txt @@ -0,0 +1,36 @@ +# Generated from qquickcanvasitem.pro. + +##################################################################### +## tst_qquickcanvasitem 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_qquickcanvasitem + GUI + QMLTEST + SOURCES + tst_qquickcanvasitem.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickcanvasitem.pro:<TRUE>: +# OTHER_FILES = "data/tst_transform.qml" "data/tst_text.qml" "data/tst_strokeStyle.qml" "data/tst_state.qml" "data/tst_shadow.qml" "data/tst_pattern.qml" "data/tst_path.qml" "data/tst_line.qml" "data/tst_fillStyle.qml" "data/tst_fillrect.qml" "data/tst_composite.qml" "data/tst_canvas.qml" "data/tst_pixel.qml" "data/tst_gradient.qml" "data/tst_arcto.qml" "data/tst_arc.qml" "data/tst_context.qml" "data/tst_imagedata.qml" "data/CanvasTestCase.qml" "data/CanvasComponent.qml" "data/tst_image.qml" "data/tst_svgpath.qml" "data/anim-gr.gif" "data/anim-gr.png" "data/anim-poster-gr.png" "data/background.png" "data/broken.png" "data/ggrr-256x256.png" "data/green-1x1.png" "data/green-2x2.png" "data/green-16x16.png" "data/green-256x256.png" "data/green.png" "data/grgr-256x256.png" "data/red-16x16.png" "data/red.png" "data/redtransparent.png" "data/rgrg-256x256.png" "data/rrgg-256x256.png" "data/transparent.png" "data/transparent50.png" "data/yellow.png" "data/yellow75.png" "data/tst_invalidContext.qml" +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickcanvasitem CONDITION EXISTS _ss_[QT_INSTALL_PLUGINS]/imageformats + DEFINES + HAS_IMAGE_FORMATS +) diff --git a/tests/auto/quick/qquickcolorgroup/CMakeLists.txt b/tests/auto/quick/qquickcolorgroup/CMakeLists.txt new file mode 100644 index 0000000000..99506fc24d --- /dev/null +++ b/tests/auto/quick/qquickcolorgroup/CMakeLists.txt @@ -0,0 +1,8 @@ +qt_add_test(tst_qquickcolorgroup + SOURCES + tst_qquickcolorgroup.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::QmlPrivate + Qt::QuickPrivate +) diff --git a/tests/auto/quick/qquickcolorgroup/qquickcolorgroup.pro b/tests/auto/quick/qquickcolorgroup/qquickcolorgroup.pro new file mode 100644 index 0000000000..99c330199c --- /dev/null +++ b/tests/auto/quick/qquickcolorgroup/qquickcolorgroup.pro @@ -0,0 +1,7 @@ +CONFIG += testcase +TARGET = tst_qquickcolorgroup +SOURCES += tst_qquickcolorgroup.cpp + +macos:CONFIG -= app_bundle + +QT += core-private qml-private quick-private testlib diff --git a/tests/auto/quick/qquickcolorgroup/tst_qquickcolorgroup.cpp b/tests/auto/quick/qquickcolorgroup/tst_qquickcolorgroup.cpp new file mode 100644 index 0000000000..04cc81683c --- /dev/null +++ b/tests/auto/quick/qquickcolorgroup/tst_qquickcolorgroup.cpp @@ -0,0 +1,117 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtTest/qtest.h> +#include <QtTest/QSignalSpy> + +#include <QtGui/QPalette> + +#include <QtQuick/private/qquickcolorgroup_p.h> + +class tst_QQuickColorGroup : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + void checkColorProperty(); + void checkColorProperty_data(); + + void colorGroupChangedWhenColorChanged(); +}; + +void tst_QQuickColorGroup::checkColorProperty() +{ + QFETCH(int, propertyIndex); + + auto property = QQuickColorGroup::staticMetaObject.property(propertyIndex); + + QVERIFY(property.isReadable()); + QVERIFY(property.isWritable()); + QVERIFY(property.isResettable()); + QVERIFY(property.hasNotifySignal()); + + const QQuickColorGroup defaultGroup; + QQuickColorGroup group; + + auto notifierSignature = QString::number(QSIGNAL_CODE) + property.notifySignal().methodSignature(); + QSignalSpy sp(&group, notifierSignature.toUtf8()); + + QVERIFY(property.write(&group, QColor(Qt::red))); + + QCOMPARE(qvariant_cast<QColor>(property.read(&group)), QColor(Qt::red)); + + QVERIFY(property.reset(&group)); + + QCOMPARE(qvariant_cast<QColor>(property.read(&group)), + qvariant_cast<QColor>(property.read(&defaultGroup))); + + constexpr int expectedNotificationsCount = 2; // One from write + one from reset + QCOMPARE(sp.count(), expectedNotificationsCount); +} + +void tst_QQuickColorGroup::checkColorProperty_data() +{ + QTest::addColumn<int>("propertyIndex"); + + auto mo = QQuickColorGroup::staticMetaObject; + for (int i = mo.propertyOffset(); i < mo.propertyCount(); ++i) { + auto property = mo.property(i); + if (property.type() == QVariant::Color) { + QTest::addRow("%s", property.name()) << i; + } + } +} + +void tst_QQuickColorGroup::colorGroupChangedWhenColorChanged() +{ + QQuickColorGroup group; + group.setGroupTag(QPalette::Active); + + QSignalSpy sp(&group, &QQuickColorGroup::changed); + + QVERIFY(group.mid() != Qt::blue); + + group.setMid(Qt::blue); + + QCOMPARE(sp.count(), 1); +} + +QTEST_MAIN(tst_QQuickColorGroup) + +#include "tst_qquickcolorgroup.moc" diff --git a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt new file mode 100644 index 0000000000..4ce3896d23 --- /dev/null +++ b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt @@ -0,0 +1,47 @@ +# Generated from qquickdesignersupport.pro. + +##################################################################### +## tst_qquickdesignersupport 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_qquickdesignersupport + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickdesignersupport.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickdesignersupport.pro:<TRUE>: +# DISTFILES = "data/TestComponent.qml" "data/test.qml" "data/componentTest.qml" "data/Component01.qml" "data/Component02.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickdesignersupport CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickdesignersupport CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickdesignersupport/tst_qquickdesignersupport.cpp b/tests/auto/quick/qquickdesignersupport/tst_qquickdesignersupport.cpp index b44977bd5a..a4ef25be92 100644 --- a/tests/auto/quick/qquickdesignersupport/tst_qquickdesignersupport.cpp +++ b/tests/auto/quick/qquickdesignersupport/tst_qquickdesignersupport.cpp @@ -76,7 +76,10 @@ void tst_qquickdesignersupport::customData() QVERIFY(rootItem); - QScopedPointer<QObject> newItemScopedPointer(QQuickDesignerSupportItems::createPrimitive(QLatin1String("QtQuick/Item"), 2, 6, view->rootContext())); + QScopedPointer<QObject> newItemScopedPointer(QQuickDesignerSupportItems::createPrimitive( + QLatin1String("QtQuick/Item"), + QTypeRevision::fromVersion(2, 6), + view->rootContext())); QObject *newItem = newItemScopedPointer.data(); QVERIFY(newItem); @@ -458,9 +461,14 @@ void tst_qquickdesignersupport::testNotifyPropertyChangeCallBack() QCOMPARE(s_propertyName, QQuickDesignerSupport::PropertyName("gradient")); } +// We have to use this ugly approach, because the signature of +// registerFixResourcePathsForObjectCallBack doesn't accept +// a proper lambda with a capture list +static QVector<QObject*> s_allSubObjects; + static void fixResourcePathsForObjectCallBackFunction(QObject *object) { - s_object = object; + s_allSubObjects << object; } static void (*fixResourcePathsForObjectCallBackPointer)(QObject *) = &fixResourcePathsForObjectCallBackFunction; @@ -477,7 +485,7 @@ void tst_qquickdesignersupport::testFixResourcePathsForObjectCallBack() QVERIFY(rootItem); - s_object = nullptr; + s_allSubObjects.clear(); QQuickDesignerSupportItems::registerFixResourcePathsForObjectCallBack(fixResourcePathsForObjectCallBackPointer); @@ -487,8 +495,12 @@ void tst_qquickdesignersupport::testFixResourcePathsForObjectCallBack() QQuickDesignerSupportItems::tweakObjects(simpleItem); - //Check that the fixResourcePathsForObjectCallBack was called on simpleItem - QCOMPARE(simpleItem , s_object); + // Check that the fixResourcePathsForObjectCallBack was called on simpleItem + // NOTE: more objects are collected now. There is also at least a palette + // that created on demand. + QVERIFY(s_allSubObjects.contains(simpleItem)); + + s_allSubObjects.clear(); } void doComponentCompleteRecursive(QObject *object) diff --git a/tests/auto/quick/qquickdrag/CMakeLists.txt b/tests/auto/quick/qquickdrag/CMakeLists.txt new file mode 100644 index 0000000000..046072e769 --- /dev/null +++ b/tests/auto/quick/qquickdrag/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from qquickdrag.pro. + +##################################################################### +## tst_qquickdrag Test: +##################################################################### + +qt_add_test(tst_qquickdrag + SOURCES + tst_qquickdrag.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlPrivate + Qt::QuickPrivate +) + +## Scopes: +##################################################################### diff --git a/tests/auto/quick/qquickdroparea/CMakeLists.txt b/tests/auto/quick/qquickdroparea/CMakeLists.txt new file mode 100644 index 0000000000..2e64905df5 --- /dev/null +++ b/tests/auto/quick/qquickdroparea/CMakeLists.txt @@ -0,0 +1,48 @@ +# Generated from qquickdroparea.pro. + +##################################################################### +## tst_qquickdroparea 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_qquickdroparea + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickdroparea.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickdroparea.pro:<TRUE>: +# OTHER_FILES = "data/*.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickdroparea CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickdroparea CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt b/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt new file mode 100644 index 0000000000..e843088036 --- /dev/null +++ b/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt @@ -0,0 +1,37 @@ +# Generated from qquickdynamicpropertyanimation.pro. + +##################################################################### +## tst_qquickdynamicpropertyanimation 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_qquickdynamicpropertyanimation + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickdynamicpropertyanimation.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::Gui + Qt::Qml + Qt::Quick + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickdynamicpropertyanimation CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickdynamicpropertyanimation CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickflickable/CMakeLists.txt b/tests/auto/quick/qquickflickable/CMakeLists.txt new file mode 100644 index 0000000000..579f5bcfd7 --- /dev/null +++ b/tests/auto/quick/qquickflickable/CMakeLists.txt @@ -0,0 +1,44 @@ +# Generated from qquickflickable.pro. + +##################################################################### +## tst_qquickflickable 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_qquickflickable + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickflickable.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickflickable CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickflickable CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickflipable/CMakeLists.txt b/tests/auto/quick/qquickflipable/CMakeLists.txt new file mode 100644 index 0000000000..e30d57a4ba --- /dev/null +++ b/tests/auto/quick/qquickflipable/CMakeLists.txt @@ -0,0 +1,39 @@ +# Generated from qquickflipable.pro. + +##################################################################### +## tst_qquickflipable 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_qquickflipable + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickflipable.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickflipable CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickflipable CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickfocusscope/CMakeLists.txt b/tests/auto/quick/qquickfocusscope/CMakeLists.txt new file mode 100644 index 0000000000..f106e8bde2 --- /dev/null +++ b/tests/auto/quick/qquickfocusscope/CMakeLists.txt @@ -0,0 +1,44 @@ +# Generated from qquickfocusscope.pro. + +##################################################################### +## tst_qquickfocusscope 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_qquickfocusscope + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickfocusscope.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickfocusscope CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickfocusscope CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickfontloader/CMakeLists.txt b/tests/auto/quick/qquickfontloader/CMakeLists.txt new file mode 100644 index 0000000000..d244c0a2e7 --- /dev/null +++ b/tests/auto/quick/qquickfontloader/CMakeLists.txt @@ -0,0 +1,41 @@ +# Generated from qquickfontloader.pro. + +##################################################################### +## tst_qquickfontloader 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_qquickfontloader + SOURCES + ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h + ../../shared/util.cpp ../../shared/util.h + tst_qquickfontloader.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickfontloader CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickfontloader CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickfontloader/data/qtbug-20268.qml b/tests/auto/quick/qquickfontloader/data/qtbug-20268.qml index 0eafdfa17b..e9282bf2c7 100644 --- a/tests/auto/quick/qquickfontloader/data/qtbug-20268.qml +++ b/tests/auto/quick/qquickfontloader/data/qtbug-20268.qml @@ -4,7 +4,7 @@ Rectangle { id: test property variant fontloader: fontloaderelement height: 100; width: 100 - property bool usename: false + property bool useotherfont: false property int statenum: 1 property alias name: fontloaderelement.name property alias source: fontloaderelement.source @@ -15,11 +15,11 @@ Rectangle { } states: [ - State { name: "start"; when: !usename + State { name: "start"; when: !useotherfont PropertyChanges { target: fontloaderelement; source: "tarzeau_ocr_a.ttf" } }, - State { name: "changefont"; when: usename - PropertyChanges { target: fontloaderelement; name: "Tahoma" } + State { name: "changefont"; when: useotherfont + PropertyChanges { target: fontloaderelement; source: "daniel.ttf" } } ] diff --git a/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp b/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp index 87a5bd469a..8f6910bee4 100644 --- a/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp +++ b/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp @@ -45,7 +45,6 @@ public: private slots: void initTestCase(); void noFont(); - void namedFont(); void localFont(); void failLocalFont(); void webFont(); @@ -85,19 +84,6 @@ void tst_qquickfontloader::noFont() delete fontObject; } -void tst_qquickfontloader::namedFont() -{ - QString componentStr = "import QtQuick 2.0\nFontLoader { name: \"Helvetica\" }"; - QQmlComponent component(&engine); - component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QQuickFontLoader *fontObject = qobject_cast<QQuickFontLoader*>(component.create()); - - QVERIFY(fontObject != nullptr); - QCOMPARE(fontObject->source(), QUrl("")); - QCOMPARE(fontObject->name(), QString("Helvetica")); - QTRY_COMPARE(fontObject->status(), QQuickFontLoader::Ready); -} - void tst_qquickfontloader::localFont() { QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" + testFileUrl("tarzeau_ocr_a.ttf").toString() + "\" }"; @@ -223,16 +209,10 @@ void tst_qquickfontloader::changeFontSourceViaState() QVERIFY(fontObject->source() != QUrl("")); QTRY_COMPARE(fontObject->name(), QString("OCRA")); - window.rootObject()->setProperty("usename", true); - - // This warning should probably not be printed once QTBUG-20268 is fixed - QString warning = QString(testFileUrl("qtbug-20268.qml").toString()) + - QLatin1String(":13:5: QML FontLoader: Cannot load font: \"\""); - QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); + window.rootObject()->setProperty("useotherfont", true); - QEXPECT_FAIL("", "QTBUG-20268", Abort); QTRY_COMPARE(fontObject->status(), QQuickFontLoader::Ready); - QCOMPARE(window.rootObject()->property("name").toString(), QString("Tahoma")); + QCOMPARE(window.rootObject()->property("name").toString(), QString("Daniel")); } QTEST_MAIN(tst_qquickfontloader) diff --git a/tests/auto/quick/qquickfontloader_static/CMakeLists.txt b/tests/auto/quick/qquickfontloader_static/CMakeLists.txt new file mode 100644 index 0000000000..ce25511fca --- /dev/null +++ b/tests/auto/quick/qquickfontloader_static/CMakeLists.txt @@ -0,0 +1,42 @@ +# Generated from qquickfontloader_static.pro. + +##################################################################### +## tst_qquickfontloader_static 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_qquickfontloader_static + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickfontloader_static.cpp + DEFINES + QT_DISABLE_DEPRECATED_BEFORE=0 + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickfontloader_static CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickfontloader_static CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickfontmetrics/CMakeLists.txt b/tests/auto/quick/qquickfontmetrics/CMakeLists.txt new file mode 100644 index 0000000000..7509c6dd86 --- /dev/null +++ b/tests/auto/quick/qquickfontmetrics/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from qquickfontmetrics.pro. + +##################################################################### +## tst_quickfontmetrics Test: +##################################################################### + +qt_add_test(tst_quickfontmetrics + SOURCES + tst_quickfontmetrics.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Qml + Qt::QuickPrivate +) + +## Scopes: +##################################################################### diff --git a/tests/auto/quick/qquickframebufferobject/CMakeLists.txt b/tests/auto/quick/qquickframebufferobject/CMakeLists.txt new file mode 100644 index 0000000000..ba720e1d26 --- /dev/null +++ b/tests/auto/quick/qquickframebufferobject/CMakeLists.txt @@ -0,0 +1,39 @@ +# Generated from qquickframebufferobject.pro. + +##################################################################### +## tst_qquickframebufferobject 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_qquickframebufferobject + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickframebufferobject.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::Gui + Qt::Quick + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickframebufferobject.pro:<TRUE>: +# OTHER_FILES = "data/testStuff.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickframebufferobject CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickframebufferobject CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp b/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp index 6aff66d61e..2327270b0f 100644 --- a/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp +++ b/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp @@ -30,9 +30,9 @@ #include <QtQuick/qquickitem.h> #include <QtQuick/qquickview.h> -#include <QtGui/qopenglcontext.h> -#include <QtGui/qopenglframebufferobject.h> -#include <QtGui/qopenglfunctions.h> +#include <qopenglcontext.h> +#include <qopenglframebufferobject.h> +#include <qopenglfunctions.h> #include <QtQuick/QQuickFramebufferObject> diff --git a/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt b/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt new file mode 100644 index 0000000000..a85a526ca4 --- /dev/null +++ b/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt @@ -0,0 +1,39 @@ +# Generated from qquickgraphicsinfo.pro. + +##################################################################### +## tst_qquickgraphicsinfo 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_qquickgraphicsinfo + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickgraphicsinfo.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::Gui + Qt::Quick + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickgraphicsinfo.pro:<TRUE>: +# OTHER_FILES = "data/basic.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickgraphicsinfo CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickgraphicsinfo CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickgraphicsinfo/tst_qquickgraphicsinfo.cpp b/tests/auto/quick/qquickgraphicsinfo/tst_qquickgraphicsinfo.cpp index 4da6da6043..aff081c4a8 100644 --- a/tests/auto/quick/qquickgraphicsinfo/tst_qquickgraphicsinfo.cpp +++ b/tests/auto/quick/qquickgraphicsinfo/tst_qquickgraphicsinfo.cpp @@ -36,7 +36,7 @@ #include "../../shared/util.h" #if QT_CONFIG(opengl) -#include <QtGui/qopenglcontext.h> +#include <qopenglcontext.h> #include <QtGui/qsurfaceformat.h> #endif diff --git a/tests/auto/quick/qquickgridview/CMakeLists.txt b/tests/auto/quick/qquickgridview/CMakeLists.txt new file mode 100644 index 0000000000..de7cfe581c --- /dev/null +++ b/tests/auto/quick/qquickgridview/CMakeLists.txt @@ -0,0 +1,49 @@ +# Generated from qquickgridview.pro. + +##################################################################### +## tst_qquickgridview 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_qquickgridview + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickgridview.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlModelsPrivate + Qt::QmlPrivate + Qt::QuickPrivate + Qt::QuickTest + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickgridview.pro:<TRUE>: +# testcase.timeout = "1100" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickgridview CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickgridview CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickimage/CMakeLists.txt b/tests/auto/quick/qquickimage/CMakeLists.txt new file mode 100644 index 0000000000..4aeed8b2f2 --- /dev/null +++ b/tests/auto/quick/qquickimage/CMakeLists.txt @@ -0,0 +1,46 @@ +# Generated from qquickimage.pro. + +##################################################################### +## tst_qquickimage 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_qquickimage + SOURCES + ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickimage.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickimage CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickimage CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickimage/tst_qquickimage.cpp b/tests/auto/quick/qquickimage/tst_qquickimage.cpp index cf54208d8c..a9defe7b70 100644 --- a/tests/auto/quick/qquickimage/tst_qquickimage.cpp +++ b/tests/auto/quick/qquickimage/tst_qquickimage.cpp @@ -1193,7 +1193,7 @@ void tst_qquickimage::urlInterceptor() { QQmlEngine engine; MyInterceptor interceptor {testFileUrl("colors.png")}; - engine.setUrlInterceptor(&interceptor); + engine.addUrlInterceptor(&interceptor); QQmlComponent c(&engine); diff --git a/tests/auto/quick/qquickimageprovider/CMakeLists.txt b/tests/auto/quick/qquickimageprovider/CMakeLists.txt new file mode 100644 index 0000000000..7771df4237 --- /dev/null +++ b/tests/auto/quick/qquickimageprovider/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from qquickimageprovider.pro. + +##################################################################### +## tst_qquickimageprovider Test: +##################################################################### + +qt_add_test(tst_qquickimageprovider + SOURCES + tst_qquickimageprovider.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlPrivate + Qt::QuickPrivate +) + +## Scopes: +##################################################################### diff --git a/tests/auto/quick/qquickitem/CMakeLists.txt b/tests/auto/quick/qquickitem/CMakeLists.txt new file mode 100644 index 0000000000..00882afa3a --- /dev/null +++ b/tests/auto/quick/qquickitem/CMakeLists.txt @@ -0,0 +1,51 @@ +# Generated from qquickitem.pro. + +##################################################################### +## tst_qquickitem 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_qquickitem + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickitem.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickitem CONDITION TARGET Qt::Widgets + DEFINES + TEST_QTBUG_60123 + PUBLIC_LIBRARIES + Qt::Widgets +) + +qt_extend_target(tst_qquickitem CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickitem CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp index b5e001a2b7..137162099f 100644 --- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp @@ -34,6 +34,9 @@ #include "private/qquickfocusscope_p.h" #include "private/qquickitem_p.h" #include <qpa/qwindowsysteminterface.h> +#ifdef Q_OS_WIN +#include <QOpenGLContext> +#endif #include <QDebug> #include <QTimer> #include <QQmlEngine> diff --git a/tests/auto/quick/qquickitem2/CMakeLists.txt b/tests/auto/quick/qquickitem2/CMakeLists.txt new file mode 100644 index 0000000000..5d8bb99dee --- /dev/null +++ b/tests/auto/quick/qquickitem2/CMakeLists.txt @@ -0,0 +1,39 @@ +# Generated from qquickitem2.pro. + +##################################################################### +## tst_qquickitem2 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_qquickitem2 + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickitem.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickitem2 CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickitem2 CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickitemlayer/CMakeLists.txt b/tests/auto/quick/qquickitemlayer/CMakeLists.txt new file mode 100644 index 0000000000..d81ae9ecc2 --- /dev/null +++ b/tests/auto/quick/qquickitemlayer/CMakeLists.txt @@ -0,0 +1,42 @@ +# Generated from qquickitemlayer.pro. + +##################################################################### +## tst_qquickitemlayer 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_qquickitemlayer + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickitemlayer.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickitemlayer.pro:<TRUE>: +# OTHER_FILES = "data/Smooth.qml" "data/Enabled.qml" "data/Mipmap.qml" "data/Effect.qml" "data/SourceRect.qml" "data/TextureProvider.qml" "data/Visible.qml" "data/ZOrder.qml" "data/ZOrderChange.qml" "data/ToggleLayerAndEffect.qml" "data/DisableLayer.qml" "data/SamplerNameChange.qml" "data/ItemEffect.qml" "data/RectangleEffect.qml" "data/TextureMirroring.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickitemlayer CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickitemlayer CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp index 824db1b080..c5d05585e0 100644 --- a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp +++ b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp @@ -31,8 +31,8 @@ #include <QtQuick/qquickitem.h> #include <QtQuick/qquickview.h> #include <QtQuick/qsgrendererinterface.h> -#include <QtGui/qopenglcontext.h> -#include <QtGui/qopenglfunctions.h> +#include <qopenglcontext.h> +#include <qopenglfunctions.h> #include "../../shared/util.h" diff --git a/tests/auto/quick/qquicklayouts/CMakeLists.txt b/tests/auto/quick/qquicklayouts/CMakeLists.txt new file mode 100644 index 0000000000..f750a4f1c5 --- /dev/null +++ b/tests/auto/quick/qquicklayouts/CMakeLists.txt @@ -0,0 +1,28 @@ +# Generated from qquicklayouts.pro. + +##################################################################### +## tst_qquicklayouts 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_qquicklayouts + GUI + QMLTEST + SOURCES + tst_qquicklayouts.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquicklayouts.pro:<TRUE>: +# OTHER_FILES = "data/tst_rowlayout.qml" "data/tst_gridlayout.qml" "data/tst_stacklayout.qml" +# TEMPLATE = "app" diff --git a/tests/auto/quick/qquicklistview/CMakeLists.txt b/tests/auto/quick/qquicklistview/CMakeLists.txt new file mode 100644 index 0000000000..9244fb6cee --- /dev/null +++ b/tests/auto/quick/qquicklistview/CMakeLists.txt @@ -0,0 +1,54 @@ +# Generated from qquicklistview.pro. + +##################################################################### +## tst_qquicklistview 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_qquicklistview + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + incrementalmodel.cpp incrementalmodel.h + proxytestinnermodel.cpp proxytestinnermodel.h + randomsortmodel.cpp randomsortmodel.h + reusemodel.h + tst_qquicklistview.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlModelsPrivate + Qt::QmlPrivate + Qt::QuickPrivate + Qt::QuickTest + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquicklistview.pro:<TRUE>: +# DISTFILES = "data/*" +# testcase.timeout = "900" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquicklistview CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquicklistview CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickloader/CMakeLists.txt b/tests/auto/quick/qquickloader/CMakeLists.txt new file mode 100644 index 0000000000..114598bd3f --- /dev/null +++ b/tests/auto/quick/qquickloader/CMakeLists.txt @@ -0,0 +1,46 @@ +# Generated from qquickloader.pro. + +##################################################################### +## tst_qquickloader 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_qquickloader + SOURCES + ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickloader.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickloader CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickloader CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickmousearea/BLACKLIST b/tests/auto/quick/qquickmousearea/BLACKLIST index 6e0665271c..089bb3a873 100644 --- a/tests/auto/quick/qquickmousearea/BLACKLIST +++ b/tests/auto/quick/qquickmousearea/BLACKLIST @@ -1,3 +1,6 @@ +[pressAndHold] +macos ci + # QTBUG-78153 [nestedStopAtBounds] opensuse-leap @@ -5,4 +8,3 @@ opensuse-leap # QTBUG-82282 [pressOneAndTapAnother] opensuse-leap - diff --git a/tests/auto/quick/qquickmousearea/CMakeLists.txt b/tests/auto/quick/qquickmousearea/CMakeLists.txt new file mode 100644 index 0000000000..969bb745f3 --- /dev/null +++ b/tests/auto/quick/qquickmousearea/CMakeLists.txt @@ -0,0 +1,49 @@ +# Generated from qquickmousearea.pro. + +##################################################################### +## tst_qquickmousearea 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_qquickmousearea + SOURCES + ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickmousearea.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickmousearea.pro:<TRUE>: +# OTHER_FILES = "data/*.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickmousearea CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickmousearea CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt b/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt new file mode 100644 index 0000000000..dff7c77ceb --- /dev/null +++ b/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt @@ -0,0 +1,44 @@ +# Generated from qquickmultipointtoucharea.pro. + +##################################################################### +## tst_qquickmultipointtoucharea 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_qquickmultipointtoucharea + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickmultipointtoucharea.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickmultipointtoucharea CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickmultipointtoucharea CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickopenglinfo/CMakeLists.txt b/tests/auto/quick/qquickopenglinfo/CMakeLists.txt new file mode 100644 index 0000000000..ba483df856 --- /dev/null +++ b/tests/auto/quick/qquickopenglinfo/CMakeLists.txt @@ -0,0 +1,39 @@ +# Generated from qquickopenglinfo.pro. + +##################################################################### +## tst_qquickopenglinfo 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_qquickopenglinfo + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickopenglinfo.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::Gui + Qt::Quick + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickopenglinfo.pro:<TRUE>: +# OTHER_FILES = "data/basic.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickopenglinfo CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickopenglinfo CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickopenglinfo/tst_qquickopenglinfo.cpp b/tests/auto/quick/qquickopenglinfo/tst_qquickopenglinfo.cpp index 3bf61e8f17..a4cbaa453d 100644 --- a/tests/auto/quick/qquickopenglinfo/tst_qquickopenglinfo.cpp +++ b/tests/auto/quick/qquickopenglinfo/tst_qquickopenglinfo.cpp @@ -32,7 +32,7 @@ #include <QtQuick/qquickitem.h> #include <QtQuick/qquickview.h> -#include <QtGui/qopenglcontext.h> +#include <qopenglcontext.h> #include <QtGui/qsurfaceformat.h> #include "../../shared/util.h" diff --git a/tests/auto/quick/qquickpainteditem/CMakeLists.txt b/tests/auto/quick/qquickpainteditem/CMakeLists.txt new file mode 100644 index 0000000000..c07fff8ef1 --- /dev/null +++ b/tests/auto/quick/qquickpainteditem/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from qquickpainteditem.pro. + +##################################################################### +## tst_qquickpainteditem Test: +##################################################################### + +qt_add_test(tst_qquickpainteditem + SOURCES + tst_qquickpainteditem.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlPrivate + Qt::QuickPrivate +) + +## Scopes: +##################################################################### diff --git a/tests/auto/quick/qquickpalette/CMakeLists.txt b/tests/auto/quick/qquickpalette/CMakeLists.txt new file mode 100644 index 0000000000..20a8081c48 --- /dev/null +++ b/tests/auto/quick/qquickpalette/CMakeLists.txt @@ -0,0 +1,8 @@ +qt_add_test(tst_qquickpalette + SOURCES + tst_qquickpalette.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::QmlPrivate + Qt::QuickPrivate +) diff --git a/tests/auto/quick/qquickpalette/qquickpalette.pro b/tests/auto/quick/qquickpalette/qquickpalette.pro new file mode 100644 index 0000000000..96c508d82a --- /dev/null +++ b/tests/auto/quick/qquickpalette/qquickpalette.pro @@ -0,0 +1,7 @@ +CONFIG += testcase +TARGET = tst_qquickpalette +SOURCES += tst_qquickpalette.cpp + +macos:CONFIG -= app_bundle + +QT += core-private qml-private quick-private testlib diff --git a/tests/auto/quick/qquickpalette/tst_qquickpalette.cpp b/tests/auto/quick/qquickpalette/tst_qquickpalette.cpp new file mode 100644 index 0000000000..e211a034ee --- /dev/null +++ b/tests/auto/quick/qquickpalette/tst_qquickpalette.cpp @@ -0,0 +1,304 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtTest/qtest.h> +#include <QtTest/QSignalSpy> + +#include <QtQuick/private/qquickpalette_p.h> +#include <QtQuick/private/qquickabstractpaletteprovider_p.h> +#include <QtQuick/private/qquickpalettecolorprovider_p.h> + +class tst_QQuickPalette : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + void resolvingColor(); + void resolvingColor_data(); + + void newColorSubgroup(); + void newColorSubgroup_data(); + + void onlyRespectiveColorSubgroupChangedAfterAssigment(); + + void paletteChangedWhenColorGroupChanged(); + + void createDefault(); + + void changeCurrentColorGroup(); + + void inheritColor(); + + void inheritCurrentColor(); + + void overrideColor(); + + void resolveColor(); + + void createFromQtPalette(); + void convertToQtPalette(); +}; + +using GroupGetter = QQuickColorGroup* (QQuickPalette::* )() const; +Q_DECLARE_METATYPE(GroupGetter); + +void tst_QQuickPalette::resolvingColor() +{ + QFETCH(QPalette::ColorGroup, colorGroup); + QFETCH(GroupGetter, getter); + + QQuickPalette p; + p.setWindowText(Qt::red); + + auto g = (p.*getter)(); + + QVERIFY(g); + + g->setWindowText(Qt::green); + p.setCurrentGroup(colorGroup); + + QCOMPARE(p.windowText(), Qt::green); +} + +void tst_QQuickPalette::resolvingColor_data() +{ + QTest::addColumn<QPalette::ColorGroup>("colorGroup"); + QTest::addColumn<GroupGetter>("getter"); + + QTest::addRow("Inactive") << QPalette::Inactive << &QQuickPalette::inactive; + QTest::addRow("Disabled") << QPalette::Disabled << &QQuickPalette::disabled; +} + +using GroupSetter = void (QQuickPalette::* )(QQuickColorGroup *); +Q_DECLARE_METATYPE(GroupSetter); + +using GroupNotifier = void (QQuickPalette::* )(); +Q_DECLARE_METATYPE(GroupNotifier); + +void tst_QQuickPalette::newColorSubgroup() +{ + QFETCH(GroupGetter, getter); + QFETCH(GroupSetter, setter); + QFETCH(GroupNotifier, notifier); + + { + QQuickPalette p; + p.fromQPalette(Qt::blue); + + auto defaultGroup = (p.*getter)(); + QVERIFY(defaultGroup); + + QSignalSpy subgroupChanged(&p, notifier); + QSignalSpy paletteChanged(&p, &QQuickPalette::changed); + + QQuickPalette anotherPalette; + anotherPalette.fromQPalette(Qt::red); + (p.*setter)((anotherPalette.*getter)()); + + QCOMPARE(subgroupChanged.count(), 1); + QCOMPARE(paletteChanged.count(), 1); + } +} + +void tst_QQuickPalette::newColorSubgroup_data() +{ + QTest::addColumn<GroupGetter>("getter"); + QTest::addColumn<GroupSetter>("setter"); + QTest::addColumn<GroupNotifier>("notifier"); + + QTest::addRow("Active") << &QQuickPalette::active << &QQuickPalette::setActive + << &QQuickPalette::activeChanged; + QTest::addRow("Inactive") << &QQuickPalette::inactive << &QQuickPalette::setInactive + << &QQuickPalette::inactiveChanged; + QTest::addRow("Disabled") << &QQuickPalette::disabled << &QQuickPalette::setDisabled + << &QQuickPalette::disabledChanged; +} + +void tst_QQuickPalette::onlyRespectiveColorSubgroupChangedAfterAssigment() +{ + QQuickPalette palette; + palette.setWindow(Qt::red); + + QQuickPalette anotherPalette; + anotherPalette.active()->setWindow(Qt::green); + + // Only active subgroup should be copied + palette.setActive(anotherPalette.active()); + + QCOMPARE(palette.active()->window(), Qt::green); + QCOMPARE(palette.disabled()->window(), Qt::red); + QCOMPARE(palette.inactive()->window(), Qt::red); +} + +void tst_QQuickPalette::paletteChangedWhenColorGroupChanged() +{ + QQuickPalette p; + QSignalSpy sp(&p, &QQuickPalette::changed); + + p.active()->setMid(Qt::red); + p.inactive()->setMid(Qt::green); + p.disabled()->setMid(Qt::blue); + + QCOMPARE(sp.count(), 3); +} + +void tst_QQuickPalette::createDefault() +{ + QQuickPalette palette; + + QCOMPARE(palette.currentColorGroup(), QPalette::Active); + QCOMPARE(palette.active()->groupTag(), QPalette::Active); + QCOMPARE(palette.inactive()->groupTag(), QPalette::Inactive); + QCOMPARE(palette.disabled()->groupTag(), QPalette::Disabled); +} + +void tst_QQuickPalette::changeCurrentColorGroup() +{ + QQuickPalette palette; + + QSignalSpy ss(&palette, &QQuickPalette::changed); + palette.setCurrentGroup(QPalette::Disabled); + + QCOMPARE(palette.currentColorGroup(), QPalette::Disabled); + QCOMPARE(ss.count(), 1); +} + +void tst_QQuickPalette::inheritColor() +{ + QQuickPalette parentPalette; + parentPalette.setWindowText(Qt::red); + + QQuickPalette quickPalette; + quickPalette.inheritPalette(parentPalette.toQPalette()); + + QCOMPARE(quickPalette.windowText(), Qt::red); + + QQuickPalette childQuickPalette; + childQuickPalette.inheritPalette(quickPalette.toQPalette()); + + QCOMPARE(childQuickPalette.windowText(), Qt::red); +} + +void tst_QQuickPalette::inheritCurrentColor() +{ + QQuickPalette parentPalette; + parentPalette.setWindowText(Qt::green); + parentPalette.disabled()->setWindowText(Qt::red); + + + QQuickPalette quickPalette; + quickPalette.inheritPalette(parentPalette.toQPalette()); + quickPalette.setCurrentGroup(QPalette::Disabled); + + QCOMPARE(quickPalette.windowText(), Qt::red); +} + +void tst_QQuickPalette::overrideColor() +{ + QQuickPalette rootPalette; + rootPalette.setWindowText(Qt::red); + + QQuickPalette palette; + palette.inheritPalette(rootPalette.toQPalette()); + palette.setWindowText(Qt::yellow); + + QCOMPARE(palette.windowText(), Qt::yellow); + + QQuickPalette childPalette; + childPalette.inheritPalette(palette.toQPalette()); + childPalette.disabled()->setWindowText(Qt::green); + + // Color is not set for the current group. Use parent color + QCOMPARE(childPalette.windowText(), Qt::yellow); + + // Change current group to use color, specified for this particular group + childPalette.setCurrentGroup(QPalette::Disabled); + + QCOMPARE(childPalette.windowText(), Qt::green); +} + +void tst_QQuickPalette::resolveColor() +{ + QQuickPalette palette; + palette.setWindowText(Qt::red); + + // Disabled color should be red, because disabled palette is not specified + palette.setCurrentGroup(QPalette::Disabled); + QCOMPARE(palette.windowText(), Qt::red); + + // Color is changed for disabled palette, because current color group is QPalette::Disabled + palette.disabled()->setWindowText(Qt::yellow); + QCOMPARE(palette.windowText(), Qt::yellow); + QCOMPARE(palette.disabled()->windowText(), Qt::yellow); + + // Change color group back to active + palette.setCurrentGroup(QPalette::Active); + QCOMPARE(palette.windowText(), Qt::red); +} + +void tst_QQuickPalette::createFromQtPalette() +{ + QQuickPalette palette; + QPalette somePalette(Qt::red); + + QSignalSpy sp(&palette, &QQuickColorGroup::changed); + + palette.fromQPalette(QPalette()); + QCOMPARE(sp.count(), 0); + + palette.fromQPalette(somePalette); + QCOMPARE(sp.count(), 1); +} + +void tst_QQuickPalette::convertToQtPalette() +{ + QQuickPalette palette; + + QPalette somePalette(Qt::red); + palette.fromQPalette(somePalette); + + auto pp = palette.paletteProvider(); + QVERIFY(pp); + + QCOMPARE(palette.toQPalette(), somePalette.resolve(pp->defaultPalette())); +} + +QTEST_MAIN(tst_QQuickPalette) + +#include "tst_qquickpalette.moc" diff --git a/tests/auto/quick/qquickpath/CMakeLists.txt b/tests/auto/quick/qquickpath/CMakeLists.txt new file mode 100644 index 0000000000..fa41ef74e1 --- /dev/null +++ b/tests/auto/quick/qquickpath/CMakeLists.txt @@ -0,0 +1,42 @@ +# Generated from qquickpath.pro. + +##################################################################### +## tst_qquickpath 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_qquickpath + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickpath.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickpath.pro:<TRUE>: +# DISTFILES = "data/*" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickpath CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickpath CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickpathview/CMakeLists.txt b/tests/auto/quick/qquickpathview/CMakeLists.txt new file mode 100644 index 0000000000..c3df8ff6a6 --- /dev/null +++ b/tests/auto/quick/qquickpathview/CMakeLists.txt @@ -0,0 +1,51 @@ +# Generated from qquickpathview.pro. + +##################################################################### +## tst_qquickpathview 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_qquickpathview + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickpathview.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlModelsPrivate + Qt::QmlPrivate + Qt::QuickPrivate + Qt::QuickTest + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickpathview CONDITION TARGET Qt::Widgets + PUBLIC_LIBRARIES + Qt::Widgets +) + +qt_extend_target(tst_qquickpathview CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickpathview CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickpincharea/CMakeLists.txt b/tests/auto/quick/qquickpincharea/CMakeLists.txt new file mode 100644 index 0000000000..d9394bad9e --- /dev/null +++ b/tests/auto/quick/qquickpincharea/CMakeLists.txt @@ -0,0 +1,44 @@ +# Generated from qquickpincharea.pro. + +##################################################################### +## tst_qquickpincharea 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_qquickpincharea + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickpincharea.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickpincharea CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickpincharea CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickpixmapcache/CMakeLists.txt b/tests/auto/quick/qquickpixmapcache/CMakeLists.txt new file mode 100644 index 0000000000..cb2debfe6d --- /dev/null +++ b/tests/auto/quick/qquickpixmapcache/CMakeLists.txt @@ -0,0 +1,42 @@ +# Generated from qquickpixmapcache.pro. + +##################################################################### +## tst_qquickpixmapcache 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_qquickpixmapcache + SOURCES + ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h + ../../shared/util.cpp ../../shared/util.h + tst_qquickpixmapcache.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::Concurrent + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickpixmapcache CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickpixmapcache CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickpositioners/CMakeLists.txt b/tests/auto/quick/qquickpositioners/CMakeLists.txt new file mode 100644 index 0000000000..040f045598 --- /dev/null +++ b/tests/auto/quick/qquickpositioners/CMakeLists.txt @@ -0,0 +1,45 @@ +# Generated from qquickpositioners.pro. + +##################################################################### +## tst_qquickpositioners 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_qquickpositioners + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickpositioners.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + Qt::QuickTest + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickpositioners CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickpositioners CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickrectangle/CMakeLists.txt b/tests/auto/quick/qquickrectangle/CMakeLists.txt new file mode 100644 index 0000000000..4a563432b6 --- /dev/null +++ b/tests/auto/quick/qquickrectangle/CMakeLists.txt @@ -0,0 +1,44 @@ +# Generated from qquickrectangle.pro. + +##################################################################### +## tst_qquickrectangle 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_qquickrectangle + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickrectangle.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickrectangle CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickrectangle CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickrepeater/CMakeLists.txt b/tests/auto/quick/qquickrepeater/CMakeLists.txt new file mode 100644 index 0000000000..950608e0b7 --- /dev/null +++ b/tests/auto/quick/qquickrepeater/CMakeLists.txt @@ -0,0 +1,45 @@ +# Generated from qquickrepeater.pro. + +##################################################################### +## tst_qquickrepeater 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_qquickrepeater + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickrepeater.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlModelsPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickrepeater CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickrepeater CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickscreen/CMakeLists.txt b/tests/auto/quick/qquickscreen/CMakeLists.txt new file mode 100644 index 0000000000..4838fd8321 --- /dev/null +++ b/tests/auto/quick/qquickscreen/CMakeLists.txt @@ -0,0 +1,32 @@ +# Generated from qquickscreen.pro. + +##################################################################### +## tst_qquickscreen Test: +##################################################################### + +qt_add_test(tst_qquickscreen + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickscreen.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickscreen CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickscreen CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickshadereffect/CMakeLists.txt b/tests/auto/quick/qquickshadereffect/CMakeLists.txt new file mode 100644 index 0000000000..dbdf2610d2 --- /dev/null +++ b/tests/auto/quick/qquickshadereffect/CMakeLists.txt @@ -0,0 +1,32 @@ +# Generated from qquickshadereffect.pro. + +##################################################################### +## tst_qquickshadereffect Test: +##################################################################### + +qt_add_test(tst_qquickshadereffect + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickshadereffect.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickshadereffect CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickshadereffect CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickshape/CMakeLists.txt b/tests/auto/quick/qquickshape/CMakeLists.txt new file mode 100644 index 0000000000..96e48c29e5 --- /dev/null +++ b/tests/auto/quick/qquickshape/CMakeLists.txt @@ -0,0 +1,53 @@ +# Generated from qquickshape.pro. + +##################################################################### +## tst_qquickshape 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_qquickshape + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickshape.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + Qt::QuickShapesPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickshape.pro:<TRUE>: +# DISTFILES = "data/*" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickshape CONDITION TARGET Qt::Widgets + PUBLIC_LIBRARIES + Qt::Widgets +) + +qt_extend_target(tst_qquickshape CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickshape CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickshortcut/CMakeLists.txt b/tests/auto/quick/qquickshortcut/CMakeLists.txt new file mode 100644 index 0000000000..c3986d263d --- /dev/null +++ b/tests/auto/quick/qquickshortcut/CMakeLists.txt @@ -0,0 +1,42 @@ +# Generated from qquickshortcut.pro. + +##################################################################### +## tst_qquickshortcut 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_qquickshortcut + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickshortcut.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::Gui + Qt::Qml + Qt::Quick + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickshortcut CONDITION TARGET Qt::Widgets + PUBLIC_LIBRARIES + Qt::QuickWidgets +) + +qt_extend_target(tst_qquickshortcut CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickshortcut CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt b/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt new file mode 100644 index 0000000000..31841f2740 --- /dev/null +++ b/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt @@ -0,0 +1,39 @@ +# Generated from qquicksmoothedanimation.pro. + +##################################################################### +## tst_qquicksmoothedanimation 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_qquicksmoothedanimation + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquicksmoothedanimation.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquicksmoothedanimation CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquicksmoothedanimation CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickspringanimation/CMakeLists.txt b/tests/auto/quick/qquickspringanimation/CMakeLists.txt new file mode 100644 index 0000000000..4831c67c10 --- /dev/null +++ b/tests/auto/quick/qquickspringanimation/CMakeLists.txt @@ -0,0 +1,39 @@ +# Generated from qquickspringanimation.pro. + +##################################################################### +## tst_qquickspringanimation 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_qquickspringanimation + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickspringanimation.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickspringanimation CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickspringanimation CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickspritesequence/CMakeLists.txt b/tests/auto/quick/qquickspritesequence/CMakeLists.txt new file mode 100644 index 0000000000..6887b1ee79 --- /dev/null +++ b/tests/auto/quick/qquickspritesequence/CMakeLists.txt @@ -0,0 +1,40 @@ +# Generated from qquickspritesequence.pro. + +##################################################################### +## tst_qquickspritesequence 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_qquickspritesequence + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickspritesequence.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickspritesequence CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickspritesequence CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickstates/CMakeLists.txt b/tests/auto/quick/qquickstates/CMakeLists.txt new file mode 100644 index 0000000000..78a68c0f15 --- /dev/null +++ b/tests/auto/quick/qquickstates/CMakeLists.txt @@ -0,0 +1,39 @@ +# Generated from qquickstates.pro. + +##################################################################### +## tst_qquickstates 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_qquickstates + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquickstates.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickstates CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickstates CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickstyledtext/CMakeLists.txt b/tests/auto/quick/qquickstyledtext/CMakeLists.txt new file mode 100644 index 0000000000..bc73e9178c --- /dev/null +++ b/tests/auto/quick/qquickstyledtext/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from qquickstyledtext.pro. + +##################################################################### +## tst_qquickstyledtext Test: +##################################################################### + +qt_add_test(tst_qquickstyledtext + SOURCES + tst_qquickstyledtext.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlPrivate + Qt::QuickPrivate +) + +## Scopes: +##################################################################### diff --git a/tests/auto/quick/qquicksystempalette/CMakeLists.txt b/tests/auto/quick/qquicksystempalette/CMakeLists.txt new file mode 100644 index 0000000000..57efc14e65 --- /dev/null +++ b/tests/auto/quick/qquicksystempalette/CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from qquicksystempalette.pro. + +##################################################################### +## tst_qquicksystempalette Test: +##################################################################### + +qt_add_test(tst_qquicksystempalette + SOURCES + tst_qquicksystempalette.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquicksystempalette CONDITION TARGET Qt::Widgets + PUBLIC_LIBRARIES + Qt::Widgets +) diff --git a/tests/auto/quick/qquicktableview/CMakeLists.txt b/tests/auto/quick/qquicktableview/CMakeLists.txt new file mode 100644 index 0000000000..70456af1d6 --- /dev/null +++ b/tests/auto/quick/qquicktableview/CMakeLists.txt @@ -0,0 +1,50 @@ +# Generated from qquicktableview.pro. + +##################################################################### +## tst_qquicktableview 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_qquicktableview + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + testmodel.h + tst_qquicktableview.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlModelsPrivate + Qt::QmlPrivate + Qt::QuickPrivate + Qt::QuickTest + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquicktableview.pro:<TRUE>: +# DISTFILES = <EMPTY> + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquicktableview CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquicktableview CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquicktext/BLACKLIST b/tests/auto/quick/qquicktext/BLACKLIST index 08a5249e2e..b551575e9d 100644 --- a/tests/auto/quick/qquicktext/BLACKLIST +++ b/tests/auto/quick/qquicktext/BLACKLIST @@ -4,3 +4,5 @@ qemu macos [fontSizeMode] opensuse-42.1 +[contentSize] +windows gcc diff --git a/tests/auto/quick/qquicktext/CMakeLists.txt b/tests/auto/quick/qquicktext/CMakeLists.txt new file mode 100644 index 0000000000..7b1edd910f --- /dev/null +++ b/tests/auto/quick/qquicktext/CMakeLists.txt @@ -0,0 +1,42 @@ +# Generated from qquicktext.pro. + +##################################################################### +## tst_qquicktext 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_qquicktext + SOURCES + ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h + ../../shared/util.cpp ../../shared/util.h + tst_qquicktext.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::QmlPrivate + Qt::QuickPrivate + Qt::QuickTest + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquicktext CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquicktext CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index 42fdbea58d..1f132ee266 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -1506,7 +1506,7 @@ void tst_qquicktext::weight() delete textObject; } { - QString componentStr = "import QtQuick 2.0\nText { font.weight: \"Bold\"; text: \"Hello world!\" }"; + QString componentStr = "import QtQuick 2.0\nText { font.weight: Font.Bold; text: \"Hello world!\" }"; QQmlComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create()); diff --git a/tests/auto/quick/qquicktextdocument/CMakeLists.txt b/tests/auto/quick/qquicktextdocument/CMakeLists.txt new file mode 100644 index 0000000000..7d2f750549 --- /dev/null +++ b/tests/auto/quick/qquicktextdocument/CMakeLists.txt @@ -0,0 +1,39 @@ +# Generated from qquicktextdocument.pro. + +##################################################################### +## tst_qquicktextdocument 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_qquicktextdocument + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_qquicktextdocument.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquicktextdocument CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquicktextdocument CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquicktextedit/BLACKLIST b/tests/auto/quick/qquicktextedit/BLACKLIST index 36c7f0042f..b8147a0ef9 100644 --- a/tests/auto/quick/qquicktextedit/BLACKLIST +++ b/tests/auto/quick/qquicktextedit/BLACKLIST @@ -4,3 +4,7 @@ opensuse-leap # QTBUG-78846 [mouseSelectionMode] opensuse-leap + +# QTBUG-82052 +[linkHover] +macos ci diff --git a/tests/auto/quick/qquicktextedit/CMakeLists.txt b/tests/auto/quick/qquicktextedit/CMakeLists.txt new file mode 100644 index 0000000000..4a4cc3811e --- /dev/null +++ b/tests/auto/quick/qquicktextedit/CMakeLists.txt @@ -0,0 +1,51 @@ +# Generated from qquicktextedit.pro. + +##################################################################### +## tst_qquicktextedit 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_qquicktextedit + SOURCES + ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquicktextedit.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::NetworkPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquicktextedit CONDITION MACOS + PUBLIC_LIBRARIES + ${FWAppKit} +) + +qt_extend_target(tst_qquicktextedit CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquicktextedit CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquicktextinput/BLACKLIST b/tests/auto/quick/qquicktextinput/BLACKLIST index ada7c57c75..6cd24de9a9 100644 --- a/tests/auto/quick/qquicktextinput/BLACKLIST +++ b/tests/auto/quick/qquicktextinput/BLACKLIST @@ -1,3 +1,7 @@ # QTBUG-78162 [mouseSelectionMode] opensuse-leap + +# QTBUG-82058 +[setInputMask] +macos ci diff --git a/tests/auto/quick/qquicktextinput/CMakeLists.txt b/tests/auto/quick/qquicktextinput/CMakeLists.txt new file mode 100644 index 0000000000..dff1a6f555 --- /dev/null +++ b/tests/auto/quick/qquicktextinput/CMakeLists.txt @@ -0,0 +1,45 @@ +# Generated from qquicktextinput.pro. + +##################################################################### +## tst_qquicktextinput 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_qquicktextinput + SOURCES + ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h + ../../shared/util.cpp ../../shared/util.h + tst_qquicktextinput.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquicktextinput CONDITION MACOS + PUBLIC_LIBRARIES + ${FWAppKit} +) + +qt_extend_target(tst_qquicktextinput CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquicktextinput CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquicktextinput/data/qtbug-19956regexp.qml b/tests/auto/quick/qquicktextinput/data/qtbug-19956regexp.qml index b5af13cc4c..c0317f3583 100644 --- a/tests/auto/quick/qquicktextinput/data/qtbug-19956regexp.qml +++ b/tests/auto/quick/qquicktextinput/data/qtbug-19956regexp.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.14 TextInput { id: textinput @@ -6,8 +6,8 @@ TextInput { height: 50 width: 200 text: "abc" - validator: RegExpValidator { + validator: RegularExpressionValidator { id: regexpvalidator - regExp: regexvalue + regularExpression: regexvalue } } diff --git a/tests/auto/quick/qquicktextinput/data/signal_accepted.qml b/tests/auto/quick/qquicktextinput/data/signal_accepted.qml index 94c113dd9f..4de4ace542 100644 --- a/tests/auto/quick/qquicktextinput/data/signal_accepted.qml +++ b/tests/auto/quick/qquicktextinput/data/signal_accepted.qml @@ -1,4 +1,4 @@ -import QtQuick 2.2 +import QtQuick 2.14 Item { property QtObject input: input @@ -8,7 +8,7 @@ Item { Column{ TextInput { id: input; property bool acceptable: acceptableInput - validator: RegExpValidator { regExp: /[a-zA-z]{2,4}/ } + validator: RegularExpressionValidator { regularExpression: /[a-zA-z]{2,4}/ } } } } diff --git a/tests/auto/quick/qquicktextinput/data/signal_editingfinished.qml b/tests/auto/quick/qquicktextinput/data/signal_editingfinished.qml index dba186e765..7784417569 100644 --- a/tests/auto/quick/qquicktextinput/data/signal_editingfinished.qml +++ b/tests/auto/quick/qquicktextinput/data/signal_editingfinished.qml @@ -1,4 +1,4 @@ -import QtQuick 2.2 +import QtQuick 2.14 Item { property QtObject input1: input1 @@ -9,11 +9,11 @@ Item { Column{ TextInput { id: input1; property bool acceptable: acceptableInput - validator: RegExpValidator { regExp: /[a-zA-z]{2,4}/ } + validator: RegularExpressionValidator { regularExpression: /[a-zA-z]{2,4}/ } } TextInput { id: input2; property bool acceptable: acceptableInput - validator: RegExpValidator { regExp: /[a-zA-z]{2,4}/ } + validator: RegularExpressionValidator { regularExpression: /[a-zA-z]{2,4}/ } } } } diff --git a/tests/auto/quick/qquicktextinput/data/validators.qml b/tests/auto/quick/qquicktextinput/data/validators.qml index b923f69801..b1eb5bf9ea 100644 --- a/tests/auto/quick/qquicktextinput/data/validators.qml +++ b/tests/auto/quick/qquicktextinput/data/validators.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.14 Item { property variant intInput: intInput @@ -19,7 +19,7 @@ Item { } TextInput { id: strInput; property bool acceptable: acceptableInput - validator: RegExpValidator { regExp: /[a-zA-z]{2,4}/ } + validator: RegularExpressionValidator { regularExpression: /[a-zA-z]{2,4}/ } } TextInput { id: unvalidatedInput property bool acceptable: acceptableInput diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp index 2e64c80b85..18b7903eeb 100644 --- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp +++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp @@ -6008,7 +6008,7 @@ void tst_qquicktextinput::QTBUG_19956_regexp() { QUrl url = testFileUrl("qtbug-19956regexp.qml"); - QString warning = url.toString() + ":11:9: Unable to assign [undefined] to QRegExp"; + QString warning = url.toString() + ":11:9: Unable to assign [undefined] to QRegularExpression"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); QQuickView window(url); @@ -6187,9 +6187,9 @@ void tst_qquicktextinput::keypress_inputMask_withValidator() QFETCH(QString, expectedText); QFETCH(QString, expectedDisplayText); - QString componentStr = "import QtQuick 2.0\nTextInput { focus: true; inputMask: \"" + mask + "\"\n"; + QString componentStr = "import QtQuick 2.14\nTextInput { focus: true; inputMask: \"" + mask + "\"\n"; if (!validatorRegExp.isEmpty()) - componentStr += "validator: RegExpValidator { regExp: " + validatorRegExp + " }\n}"; + componentStr += "validator: RegularExpressionValidator { regularExpression: " + validatorRegExp + " }\n}"; else if (decimals > 0) componentStr += QString("validator: DoubleValidator { bottom: %1; decimals: %2; top: %3 }\n}"). arg(validatorMinimum).arg(decimals).arg(validatorMaximum); diff --git a/tests/auto/quick/qquicktextmetrics/CMakeLists.txt b/tests/auto/quick/qquicktextmetrics/CMakeLists.txt new file mode 100644 index 0000000000..74e5c2bf7e --- /dev/null +++ b/tests/auto/quick/qquicktextmetrics/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from qquicktextmetrics.pro. + +##################################################################### +## tst_qquicktextmetrics Test: +##################################################################### + +qt_add_test(tst_qquicktextmetrics + SOURCES + tst_qquicktextmetrics.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Qml + Qt::QuickPrivate +) + +## Scopes: +##################################################################### diff --git a/tests/auto/quick/qquicktimeline/CMakeLists.txt b/tests/auto/quick/qquicktimeline/CMakeLists.txt new file mode 100644 index 0000000000..1d31d0b4b9 --- /dev/null +++ b/tests/auto/quick/qquicktimeline/CMakeLists.txt @@ -0,0 +1,21 @@ +# Generated from qquicktimeline.pro. + +##################################################################### +## tst_qquicktimeline Test: +##################################################################### + +qt_add_test(tst_qquicktimeline + SOURCES + tst_qquicktimeline.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Qml + Qt::QmlPrivate + Qt::Quick + Qt::QuickPrivate +) + +## Scopes: +##################################################################### diff --git a/tests/auto/quick/qquickview/CMakeLists.txt b/tests/auto/quick/qquickview/CMakeLists.txt new file mode 100644 index 0000000000..ce0f0fad68 --- /dev/null +++ b/tests/auto/quick/qquickview/CMakeLists.txt @@ -0,0 +1,44 @@ +# Generated from qquickview.pro. + +##################################################################### +## tst_qquickview 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_qquickview + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickview.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickview CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickview CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt b/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt new file mode 100644 index 0000000000..81e9fe3601 --- /dev/null +++ b/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt @@ -0,0 +1,50 @@ +# Generated from qquickvisualdatamodel.pro. + +##################################################################### +## tst_qquickvisualdatamodel 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_qquickvisualdatamodel + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickvisualdatamodel.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlModelsPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickvisualdatamodel CONDITION TARGET Qt::Widgets + PUBLIC_LIBRARIES + Qt::Widgets +) + +qt_extend_target(tst_qquickvisualdatamodel CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickvisualdatamodel CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickwindow/CMakeLists.txt b/tests/auto/quick/qquickwindow/CMakeLists.txt new file mode 100644 index 0000000000..5d9f91280e --- /dev/null +++ b/tests/auto/quick/qquickwindow/CMakeLists.txt @@ -0,0 +1,47 @@ +# Generated from qquickwindow.pro. + +##################################################################### +## tst_qquickwindow 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_qquickwindow + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickwindow.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickwindow.pro:<TRUE>: +# OTHER_FILES = "data/active.qml" "data/AnimationsWhileHidden.qml" "data/Headless.qml" "data/showHideAnimate.qml" "data/windoworder.qml" "data/grabContentItemToImage.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickwindow CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickwindow CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index 22b04eabd8..604ac0e12e 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -2117,15 +2117,9 @@ void tst_qquickwindow::testWindowVisibilityOrder() QWindowList windows = QGuiApplication::topLevelWindows(); QTRY_COMPARE(windows.size(), 5); - if (qgetenv("XDG_CURRENT_DESKTOP") == "Unity" && QGuiApplication::focusWindow() != window3) { - qDebug() << "Unity (flaky QTBUG-62604): expected window3 to have focus; actual focusWindow:" - << QGuiApplication::focusWindow(); - } else { - QCOMPARE(window3, QGuiApplication::focusWindow()); - QVERIFY(window1->isActive()); - QVERIFY(window2->isActive()); - QVERIFY(window3->isActive()); - } + QVERIFY(window1->isActive()); + QVERIFY(window2->isActive()); + QVERIFY(window3->isActive()); //Test if window4 is shown 2 seconds after the application startup //with window4 visible window5 (transient child) should also become visible diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro index 9ab7119903..71b5794e81 100644 --- a/tests/auto/quick/quick.pro +++ b/tests/auto/quick/quick.pro @@ -42,6 +42,8 @@ PRIVATETESTS += \ qquickstyledtext \ qquickstates \ qquicksystempalette \ + qquickcolorgroup \ + qquickpalette \ qquicktimeline QUICKTESTS += \ diff --git a/tests/auto/quick/rendernode/CMakeLists.txt b/tests/auto/quick/rendernode/CMakeLists.txt new file mode 100644 index 0000000000..970934b3fb --- /dev/null +++ b/tests/auto/quick/rendernode/CMakeLists.txt @@ -0,0 +1,42 @@ +# Generated from rendernode.pro. + +##################################################################### +## tst_rendernode 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_rendernode + SOURCES + ../../shared/util.cpp ../../shared/util.h + tst_rendernode.cpp + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:rendernode.pro:<TRUE>: +# OTHER_FILES = "data/RenderOrder.qml" "data/MessUpState.qml" "data/matrix.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_rendernode CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_rendernode CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/rendernode/tst_rendernode.cpp b/tests/auto/quick/rendernode/tst_rendernode.cpp index ec248e8210..87d710ee47 100644 --- a/tests/auto/quick/rendernode/tst_rendernode.cpp +++ b/tests/auto/quick/rendernode/tst_rendernode.cpp @@ -30,8 +30,8 @@ #include <QtQuick/qquickitem.h> #include <QtQuick/qquickview.h> -#include <QtGui/qopenglcontext.h> -#include <QtGui/qopenglfunctions.h> +#include <qopenglcontext.h> +#include <qopenglfunctions.h> #include <QtGui/qscreen.h> #include <private/qsgrendernode_p.h> @@ -194,7 +194,7 @@ static bool fuzzyCompareColor(QRgb x, QRgb y, QByteArray *errorMessage) enum { fuzz = 4 }; if (qAbs(qRed(x) - qRed(y)) >= fuzz || qAbs(qGreen(x) - qGreen(y)) >= fuzz || qAbs(qBlue(x) - qBlue(y)) >= fuzz) { QString s; - QDebug(&s).nospace() << hex << "Color mismatch 0x" << x << " 0x" << y << dec << " (fuzz=" << fuzz << ")."; + QDebug(&s).nospace() << Qt::hex << "Color mismatch 0x" << x << " 0x" << y << Qt::dec << " (fuzz=" << fuzz << ")."; *errorMessage = s.toLocal8Bit(); return false; } diff --git a/tests/auto/quick/scenegraph/CMakeLists.txt b/tests/auto/quick/scenegraph/CMakeLists.txt new file mode 100644 index 0000000000..3e7fa6fe88 --- /dev/null +++ b/tests/auto/quick/scenegraph/CMakeLists.txt @@ -0,0 +1,40 @@ +# Generated from scenegraph.pro. + +##################################################################### +## tst_scenegraph Test: +##################################################################### + +qt_add_test(tst_scenegraph + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_scenegraph.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate +) + +#### Keys ignored in scope 1:.:.:scenegraph.pro:<TRUE>: +# OTHER_FILES = "data/render_OutOfFloatRange.qml" "data/simple.qml" "data/render_ImageFiltering.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_scenegraph CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_scenegraph CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quick/shared/visualtestutil.cpp b/tests/auto/quick/shared/visualtestutil.cpp index de2cf2bd5b..06f7386902 100644 --- a/tests/auto/quick/shared/visualtestutil.cpp +++ b/tests/auto/quick/shared/visualtestutil.cpp @@ -95,7 +95,7 @@ bool QQuickVisualTestUtil::compareImages(const QImage &ia, const QImage &ib, QSt || qAbs(qRed(a) - qRed(b)) > tolerance || qAbs(qRed(a) - qRed(b)) > tolerance) { QDebug(errorMessage) << "Mismatch at:" << x << y << ':' - << hex << showbase << a << b; + << Qt::hex << Qt::showbase << a << b; return false; } } diff --git a/tests/auto/quick/sharedimage/CMakeLists.txt b/tests/auto/quick/sharedimage/CMakeLists.txt new file mode 100644 index 0000000000..17d2bec634 --- /dev/null +++ b/tests/auto/quick/sharedimage/CMakeLists.txt @@ -0,0 +1,23 @@ +# Generated from sharedimage.pro. + +##################################################################### +## tst_sharedimage 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_sharedimage + SOURCES + tst_sharedimage.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::QuickPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:sharedimage.pro:<TRUE>: +# OTHER_FILES = "data/yellow.png" diff --git a/tests/auto/quick/touchmouse/CMakeLists.txt b/tests/auto/quick/touchmouse/CMakeLists.txt new file mode 100644 index 0000000000..a07596018e --- /dev/null +++ b/tests/auto/quick/touchmouse/CMakeLists.txt @@ -0,0 +1,44 @@ +# Generated from touchmouse.pro. + +##################################################################### +## tst_touchmouse 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_touchmouse + SOURCES + ../../shared/util.cpp ../../shared/util.h + ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h + ../shared/viewtestutil.cpp ../shared/viewtestutil.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_touchmouse.cpp + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + INCLUDE_DIRECTORIES + ../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +qt_extend_target(tst_touchmouse CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_touchmouse CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) |