diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2020-11-20 02:10:30 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@qt.io> | 2020-11-28 11:56:54 +0100 |
| commit | ddfb954cf4b407e246c325e794424484681ca76a (patch) | |
| tree | 170586e852237a9a840d5bab321c731962ae4787 | |
| parent | 77c3311d69306500502150407832d859c9612c4f (diff) | |
Modernize the Animators auto test build
The pro file was adapted to the state of the qquickanimations one
and the cmake part regenerated.
Pick-to: 6.0 6.0.0
Change-Id: I5dbc2c985a84019e42c974468db4b8dc0fa3d210
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | tests/auto/quick/qquickanimators/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tests/auto/quick/qquickanimators/qquickanimators.pro | 15 |
2 files changed, 12 insertions, 10 deletions
diff --git a/tests/auto/quick/qquickanimators/CMakeLists.txt b/tests/auto/quick/qquickanimators/CMakeLists.txt index 908a8158a6..8a39659627 100644 --- a/tests/auto/quick/qquickanimators/CMakeLists.txt +++ b/tests/auto/quick/qquickanimators/CMakeLists.txt @@ -13,12 +13,9 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickanimators 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_qquickanimators.cpp DEFINES - QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../shared PUBLIC_LIBRARIES @@ -31,7 +28,7 @@ qt_internal_add_test(tst_qquickanimators ) #### Keys ignored in scope 1:.:.:qquickanimators.pro:<TRUE>: -# DISTFILES = "data/*" +# OTHER_FILES = "data/positionerWithAnimator.qml" "data/windowWithAnimator.qml" ## Scopes: ##################################################################### diff --git a/tests/auto/quick/qquickanimators/qquickanimators.pro b/tests/auto/quick/qquickanimators/qquickanimators.pro index 3cc3067e77..75be8a8e4f 100644 --- a/tests/auto/quick/qquickanimators/qquickanimators.pro +++ b/tests/auto/quick/qquickanimators/qquickanimators.pro @@ -1,11 +1,16 @@ -QT += core-private gui-private qml-private quick-private testlib -TARGET=tst_qquickanimators CONFIG += testcase -macx: CONFIG -= app_bundle +TARGET = tst_qquickanimators SOURCES += tst_qquickanimators.cpp include (../../shared/util.pri) -include (../shared/util.pri) + +macos:CONFIG -= app_bundle TESTDATA = data/* -DISTFILES += data/* + +QT += core-private gui-private qml-private quick-private testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +OTHER_FILES += \ + data/positionerWithAnimator.qml \ + data/windowWithAnimator.qml |