diff options
Diffstat (limited to 'tests/auto/gui/image')
-rw-r--r-- | tests/auto/gui/image/qicoimageformat/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/auto/gui/image/qicon/CMakeLists.txt | 8 | ||||
-rw-r--r-- | tests/auto/gui/image/qiconhighdpi/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/auto/gui/image/qimage/CMakeLists.txt | 8 | ||||
-rw-r--r-- | tests/auto/gui/image/qimageiohandler/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/gui/image/qimagereader/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tests/auto/gui/image/qimagewriter/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/auto/gui/image/qmovie/CMakeLists.txt | 10 | ||||
-rw-r--r-- | tests/auto/gui/image/qpicture/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/gui/image/qpixmap/CMakeLists.txt | 8 | ||||
-rw-r--r-- | tests/auto/gui/image/qpixmapcache/CMakeLists.txt | 2 |
11 files changed, 29 insertions, 29 deletions
diff --git a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt index 0c8393631a..b97733003b 100644 --- a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt +++ b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob icons/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qicoimageformat +qt_add_test(tst_qicoimageformat SOURCES tst_qicoimageformat.cpp PUBLIC_LIBRARIES @@ -40,7 +40,7 @@ if(ANDROID) "icons/valid/yellow.cur" ) - add_qt_resource(tst_qicoimageformat "qicoimageformat" + qt_add_resource(tst_qicoimageformat "qicoimageformat" PREFIX "/" FILES diff --git a/tests/auto/gui/image/qicon/CMakeLists.txt b/tests/auto/gui/image/qicon/CMakeLists.txt index 81f5390d79..5f629fb3ed 100644 --- a/tests/auto/gui/image/qicon/CMakeLists.txt +++ b/tests/auto/gui/image/qicon/CMakeLists.txt @@ -30,7 +30,7 @@ file(GLOB_RECURSE test_data_glob *.svgz) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qicon +qt_add_test(tst_qicon SOURCES tst_qicon.cpp PUBLIC_LIBRARIES @@ -67,7 +67,7 @@ set(tst_qicon_resource_files "tst_qicon.cpp" ) -add_qt_resource(tst_qicon "tst_qicon" +qt_add_resource(tst_qicon "tst_qicon" PREFIX "/" FILES @@ -77,7 +77,7 @@ set(qmake_immediate_resource_files "tst_qicon.cpp" ) -add_qt_resource(tst_qicon "qmake_immediate" +qt_add_resource(tst_qicon "qmake_immediate" PREFIX "/" FILES @@ -88,7 +88,7 @@ add_qt_resource(tst_qicon "qmake_immediate" ## Scopes: ##################################################################### -extend_target(tst_qicon CONDITION TARGET Qt::Widgets +qt_extend_target(tst_qicon CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) diff --git a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt index 6f6aaedca5..8113422c1e 100644 --- a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt +++ b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob icons/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qiconhighdpi +qt_add_test(tst_qiconhighdpi SOURCES tst_qiconhighdpi.cpp PUBLIC_LIBRARIES @@ -28,7 +28,7 @@ set(tst_qiconhighdpi_resource_files "icons/testtheme/index.theme" ) -add_qt_resource(tst_qiconhighdpi "tst_qiconhighdpi" +qt_add_resource(tst_qiconhighdpi "tst_qiconhighdpi" PREFIX "/" FILES diff --git a/tests/auto/gui/image/qimage/CMakeLists.txt b/tests/auto/gui/image/qimage/CMakeLists.txt index f6125d0fe9..a9e3b783a7 100644 --- a/tests/auto/gui/image/qimage/CMakeLists.txt +++ b/tests/auto/gui/image/qimage/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob images/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qimage +qt_add_test(tst_qimage SOURCES tst_qimage.cpp PUBLIC_LIBRARIES @@ -46,7 +46,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "images/jpeg_exif_orientation_value_8.jpg" ) - add_qt_resource(tst_qimage "qimage" + qt_add_resource(tst_qimage "qimage" PREFIX "/" FILES @@ -54,13 +54,13 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) ) endif() -extend_target(tst_qimage CONDITION WIN32 +qt_extend_target(tst_qimage CONDITION WIN32 PUBLIC_LIBRARIES gdi32 user32 ) -extend_target(tst_qimage CONDITION APPLE +qt_extend_target(tst_qimage CONDITION APPLE PUBLIC_LIBRARIES ${FWCoreGraphics} ) diff --git a/tests/auto/gui/image/qimageiohandler/CMakeLists.txt b/tests/auto/gui/image/qimageiohandler/CMakeLists.txt index 23e5e98b16..53bfb384aa 100644 --- a/tests/auto/gui/image/qimageiohandler/CMakeLists.txt +++ b/tests/auto/gui/image/qimageiohandler/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qimageiohandler Test: ##################################################################### -add_qt_test(tst_qimageiohandler +qt_add_test(tst_qimageiohandler SOURCES tst_qimageiohandler.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/image/qimagereader/CMakeLists.txt b/tests/auto/gui/image/qimagereader/CMakeLists.txt index 8a96fa18cf..a477252e73 100644 --- a/tests/auto/gui/image/qimagereader/CMakeLists.txt +++ b/tests/auto/gui/image/qimagereader/CMakeLists.txt @@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob baseline/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qimagereader +qt_add_test(tst_qimagereader SOURCES tst_qimagereader.cpp PUBLIC_LIBRARIES @@ -35,7 +35,7 @@ set(qmake_immediate_resource_files ${resource_glob_0} ) -add_qt_resource(tst_qimagereader "qmake_immediate" +qt_add_resource(tst_qimagereader "qmake_immediate" PREFIX "/" FILES @@ -56,7 +56,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "images/trans.gif" ) - add_qt_resource(tst_qimagereader "android_testdata" + qt_add_resource(tst_qimagereader "android_testdata" PREFIX "/" FILES diff --git a/tests/auto/gui/image/qimagewriter/CMakeLists.txt b/tests/auto/gui/image/qimagewriter/CMakeLists.txt index 1a04dfbce0..9e5c7362a8 100644 --- a/tests/auto/gui/image/qimagewriter/CMakeLists.txt +++ b/tests/auto/gui/image/qimagewriter/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob images/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qimagewriter +qt_add_test(tst_qimagewriter SOURCES tst_qimagewriter.cpp PUBLIC_LIBRARIES @@ -41,7 +41,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "images/trolltech.gif" ) - add_qt_resource(tst_qimagewriter "qimagewriter" + qt_add_resource(tst_qimagewriter "qimagewriter" PREFIX "/" FILES diff --git a/tests/auto/gui/image/qmovie/CMakeLists.txt b/tests/auto/gui/image/qmovie/CMakeLists.txt index bc841b5d29..3e9b2ad100 100644 --- a/tests/auto/gui/image/qmovie/CMakeLists.txt +++ b/tests/auto/gui/image/qmovie/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob animations/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qmovie +qt_add_test(tst_qmovie SOURCES tst_qmovie.cpp PUBLIC_LIBRARIES @@ -25,7 +25,7 @@ set(resources_resource_files "animations/trolltech.gif" ) -add_qt_resource(tst_qmovie "resources" +qt_add_resource(tst_qmovie "resources" PREFIX "/" FILES @@ -40,17 +40,17 @@ add_qt_resource(tst_qmovie "resources" ## Scopes: ##################################################################### -extend_target(tst_qmovie CONDITION TARGET Qt::Widgets +qt_extend_target(tst_qmovie CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -extend_target(tst_qmovie CONDITION QT_FEATURE_gif +qt_extend_target(tst_qmovie CONDITION QT_FEATURE_gif DEFINES QTEST_HAVE_GIF ) -extend_target(tst_qmovie CONDITION QT_FEATURE_jpeg +qt_extend_target(tst_qmovie CONDITION QT_FEATURE_jpeg DEFINES QTEST_HAVE_JPEG ) diff --git a/tests/auto/gui/image/qpicture/CMakeLists.txt b/tests/auto/gui/image/qpicture/CMakeLists.txt index 625d19b3a5..f79c72974a 100644 --- a/tests/auto/gui/image/qpicture/CMakeLists.txt +++ b/tests/auto/gui/image/qpicture/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpicture Test: ##################################################################### -add_qt_test(tst_qpicture +qt_add_test(tst_qpicture SOURCES tst_qpicture.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/image/qpixmap/CMakeLists.txt b/tests/auto/gui/image/qpixmap/CMakeLists.txt index efdfb3b98e..b58609a760 100644 --- a/tests/auto/gui/image/qpixmap/CMakeLists.txt +++ b/tests/auto/gui/image/qpixmap/CMakeLists.txt @@ -22,7 +22,7 @@ file(GLOB_RECURSE test_data_glob images/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_qpixmap +qt_add_test(tst_qpixmap SOURCES tst_qpixmap.cpp PUBLIC_LIBRARIES @@ -83,7 +83,7 @@ set(qpixmap_resource_files "loadFromData/designer_rgb32.png" ) -add_qt_resource(tst_qpixmap "qpixmap" +qt_add_resource(tst_qpixmap "qpixmap" PREFIX "/" FILES @@ -94,13 +94,13 @@ add_qt_resource(tst_qpixmap "qpixmap" ## Scopes: ##################################################################### -extend_target(tst_qpixmap CONDITION TARGET Qt::Widgets +qt_extend_target(tst_qpixmap CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets Qt::WidgetsPrivate ) -extend_target(tst_qpixmap CONDITION WIN32 +qt_extend_target(tst_qpixmap CONDITION WIN32 PUBLIC_LIBRARIES gdi32 user32 diff --git a/tests/auto/gui/image/qpixmapcache/CMakeLists.txt b/tests/auto/gui/image/qpixmapcache/CMakeLists.txt index ef73f60ca6..33c1faf865 100644 --- a/tests/auto/gui/image/qpixmapcache/CMakeLists.txt +++ b/tests/auto/gui/image/qpixmapcache/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpixmapcache Test: ##################################################################### -add_qt_test(tst_qpixmapcache +qt_add_test(tst_qpixmapcache SOURCES tst_qpixmapcache.cpp PUBLIC_LIBRARIES |