diff options
author | Leander Beernaert <leander.beernaert@qt.io> | 2019-10-28 11:19:47 +0100 |
---|---|---|
committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-04 13:36:46 +0000 |
commit | 56115dba42a4376fd6b24541dee023a675612ce9 (patch) | |
tree | 8a9a58720a104af9393326a54191b43f932f823f | |
parent | e7118bd7fd42479014c9610c90fc1cd0014fd0c8 (diff) |
Convert remaining gui utils tests
Fixes:QTBUG-78229
Change-Id: I3bff1b562e1c146f291e5692c90d2c38f162d395
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r-- | tests/auto/gui/util/CMakeLists.txt | 22 | ||||
-rw-r--r-- | tests/auto/gui/util/qdesktopservices/CMakeLists.txt | 14 | ||||
-rw-r--r-- | tests/auto/gui/util/qdoublevalidator/CMakeLists.txt | 13 | ||||
-rw-r--r-- | tests/auto/gui/util/qintvalidator/CMakeLists.txt | 13 | ||||
-rw-r--r-- | tests/auto/gui/util/qregexpvalidator/CMakeLists.txt | 13 | ||||
-rw-r--r-- | tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt | 13 | ||||
-rw-r--r-- | tests/auto/gui/util/qshadergenerator/CMakeLists.txt | 14 | ||||
-rw-r--r-- | tests/auto/gui/util/qshadergraph/CMakeLists.txt | 14 | ||||
-rw-r--r-- | tests/auto/gui/util/qshadergraphloader/CMakeLists.txt | 14 | ||||
-rw-r--r-- | tests/auto/gui/util/qshadernodes/CMakeLists.txt | 14 | ||||
-rw-r--r-- | tests/auto/gui/util/qshadernodesloader/CMakeLists.txt | 14 | ||||
-rw-r--r-- | tests/auto/gui/util/qtexturefilereader/CMakeLists.txt | 31 |
12 files changed, 174 insertions, 15 deletions
diff --git a/tests/auto/gui/util/CMakeLists.txt b/tests/auto/gui/util/CMakeLists.txt index c7dec5460d..4e0a6b7e25 100644 --- a/tests/auto/gui/util/CMakeLists.txt +++ b/tests/auto/gui/util/CMakeLists.txt @@ -1,13 +1,13 @@ # Generated from util.pro. -# add_subdirectory("qdesktopservices") -add_subdirectory("qdoublevalidator") -add_subdirectory("qintvalidator") -add_subdirectory("qregexpvalidator") -add_subdirectory("qregularexpressionvalidator") -# add_subdirectory("qshadergenerator") -# add_subdirectory("qshadergraph") -# add_subdirectory("qshadergraphloader") -# add_subdirectory("qshadernodes") -# add_subdirectory("qshadernodesloader") -# add_subdirectory("qtexturefilereader") +add_subdirectory(qdesktopservices) +add_subdirectory(qdoublevalidator) +add_subdirectory(qintvalidator) +add_subdirectory(qregexpvalidator) +add_subdirectory(qregularexpressionvalidator) +add_subdirectory(qshadergenerator) +add_subdirectory(qshadergraph) +add_subdirectory(qshadergraphloader) +add_subdirectory(qshadernodes) +add_subdirectory(qshadernodesloader) +add_subdirectory(qtexturefilereader) diff --git a/tests/auto/gui/util/qdesktopservices/CMakeLists.txt b/tests/auto/gui/util/qdesktopservices/CMakeLists.txt new file mode 100644 index 0000000000..15a7aacd7a --- /dev/null +++ b/tests/auto/gui/util/qdesktopservices/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qdesktopservices.pro. + +##################################################################### +## tst_qdesktopservices Test: +##################################################################### + +add_qt_test(tst_qdesktopservices + SOURCES + tst_qdesktopservices.cpp + DEFINES + # QT_DISABLE_DEPRECATED_BEFORE=0 # special case + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt b/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt index 5d6bf2ceea..6cccd082a9 100644 --- a/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt +++ b/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt @@ -1 +1,12 @@ -add_qt_test(tst_qdoublevalidator SOURCES tst_qdoublevalidator.cpp LIBRARIES Qt::Gui) +# Generated from qdoublevalidator.pro. + +##################################################################### +## tst_qdoublevalidator Test: +##################################################################### + +add_qt_test(tst_qdoublevalidator + SOURCES + tst_qdoublevalidator.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/gui/util/qintvalidator/CMakeLists.txt b/tests/auto/gui/util/qintvalidator/CMakeLists.txt index 54bb16e248..69a5503d8e 100644 --- a/tests/auto/gui/util/qintvalidator/CMakeLists.txt +++ b/tests/auto/gui/util/qintvalidator/CMakeLists.txt @@ -1 +1,12 @@ -add_qt_test(tst_qintvalidator SOURCES tst_qintvalidator.cpp LIBRARIES Qt::Gui) +# Generated from qintvalidator.pro. + +##################################################################### +## tst_qintvalidator Test: +##################################################################### + +add_qt_test(tst_qintvalidator + SOURCES + tst_qintvalidator.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/gui/util/qregexpvalidator/CMakeLists.txt b/tests/auto/gui/util/qregexpvalidator/CMakeLists.txt index 1447d702ec..4f7d7da0c2 100644 --- a/tests/auto/gui/util/qregexpvalidator/CMakeLists.txt +++ b/tests/auto/gui/util/qregexpvalidator/CMakeLists.txt @@ -1 +1,12 @@ -add_qt_test(tst_qregexpvalidator SOURCES tst_qregexpvalidator.cpp LIBRARIES Qt::Gui) +# Generated from qregexpvalidator.pro. + +##################################################################### +## tst_qregexpvalidator Test: +##################################################################### + +add_qt_test(tst_qregexpvalidator + SOURCES + tst_qregexpvalidator.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt b/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt index 8d57b0fa08..8633a171e5 100644 --- a/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt +++ b/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt @@ -1 +1,12 @@ -add_qt_test(tst_qregularexpressionvalidator SOURCES tst_qregularexpressionvalidator.cpp LIBRARIES Qt::Gui) +# Generated from qregularexpressionvalidator.pro. + +##################################################################### +## tst_qregularexpressionvalidator Test: +##################################################################### + +add_qt_test(tst_qregularexpressionvalidator + SOURCES + tst_qregularexpressionvalidator.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/gui/util/qshadergenerator/CMakeLists.txt b/tests/auto/gui/util/qshadergenerator/CMakeLists.txt new file mode 100644 index 0000000000..a12cabbf84 --- /dev/null +++ b/tests/auto/gui/util/qshadergenerator/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qshadergenerator.pro. + +##################################################################### +## tst_qshadergenerator Test: +##################################################################### + +add_qt_test(tst_qshadergenerator + SOURCES + tst_qshadergenerator.cpp + LIBRARIES + Qt::GuiPrivate + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/gui/util/qshadergraph/CMakeLists.txt b/tests/auto/gui/util/qshadergraph/CMakeLists.txt new file mode 100644 index 0000000000..0e5eef8dd5 --- /dev/null +++ b/tests/auto/gui/util/qshadergraph/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qshadergraph.pro. + +##################################################################### +## tst_qshadergraph Test: +##################################################################### + +add_qt_test(tst_qshadergraph + SOURCES + tst_qshadergraph.cpp + LIBRARIES + Qt::GuiPrivate + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt b/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt new file mode 100644 index 0000000000..683df0029f --- /dev/null +++ b/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qshadergraphloader.pro. + +##################################################################### +## tst_qshadergraphloader Test: +##################################################################### + +add_qt_test(tst_qshadergraphloader + SOURCES + tst_qshadergraphloader.cpp + LIBRARIES + Qt::GuiPrivate + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/gui/util/qshadernodes/CMakeLists.txt b/tests/auto/gui/util/qshadernodes/CMakeLists.txt new file mode 100644 index 0000000000..e70c36e8f8 --- /dev/null +++ b/tests/auto/gui/util/qshadernodes/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qshadernodes.pro. + +##################################################################### +## tst_qshadernodes Test: +##################################################################### + +add_qt_test(tst_qshadernodes + SOURCES + tst_qshadernodes.cpp + LIBRARIES + Qt::GuiPrivate + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt b/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt new file mode 100644 index 0000000000..226eac25a3 --- /dev/null +++ b/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qshadernodesloader.pro. + +##################################################################### +## tst_qshadernodesloader Test: +##################################################################### + +add_qt_test(tst_qshadernodesloader + SOURCES + tst_qshadernodesloader.cpp + LIBRARIES + Qt::GuiPrivate + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt b/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt new file mode 100644 index 0000000000..abb48884d3 --- /dev/null +++ b/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt @@ -0,0 +1,31 @@ +# Generated from qtexturefilereader.pro. + +##################################################################### +## tst_qtexturefilereader Test: +##################################################################### + +add_qt_test(tst_qtexturefilereader + SOURCES + tst_qtexturefilereader.cpp + LIBRARIES + Qt::GuiPrivate + PUBLIC_LIBRARIES + Qt::Gui +) + +# Resources: +set(qtexturefilereader_resource_files + "texturefiles/car.ktx" + "texturefiles/car_mips.ktx" + "texturefiles/newlogo.astc" + "texturefiles/newlogo_srgb.astc" + "texturefiles/pattern.pkm" +) + +add_qt_resource(tst_qtexturefilereader "qtexturefilereader" + PREFIX + "/" + FILES + ${qtexturefilereader_resource_files} +) + |