diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-04-06 15:15:00 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-04-06 15:39:46 +0200 |
commit | e1118b757c7c672817de65a310545de522a6abc2 (patch) | |
tree | e02f309ac3aeb60a63e5abe310d245abdaeef0fe | |
parent | e4f1c1068bccea38889ba1d66dfcecacbb9f6634 (diff) |
CMake: Regenerate projects
Change-Id: I7f1716d8524e1e6a1491a01ba71dbd7f078ade14
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r-- | tests/auto/qml/qjsengine/.prev_CMakeLists.txt | 55 | ||||
-rw-r--r-- | tests/auto/qml/qjsengine/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/qml/qjsvalue/.prev_CMakeLists.txt | 19 |
3 files changed, 74 insertions, 1 deletions
diff --git a/tests/auto/qml/qjsengine/.prev_CMakeLists.txt b/tests/auto/qml/qjsengine/.prev_CMakeLists.txt new file mode 100644 index 0000000000..aaff27ee03 --- /dev/null +++ b/tests/auto/qml/qjsengine/.prev_CMakeLists.txt @@ -0,0 +1,55 @@ +# Generated from qjsengine.pro. + +##################################################################### +## tst_qjsengine Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + script/*) +list(APPEND test_data ${test_data_glob}) + +qt_add_test(tst_qjsengine + SOURCES + tst_qjsengine.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate + Qt::Qml + Qt::QmlPrivate + Qt::Widgets + TESTDATA ${test_data} +) + +# Resources: +set(qjsengine_resource_files + "translations/idtranslatable-unicode.qm" + "translations/idtranslatable_la.qm" + "translations/translatable-unicode.qm" + "translations/translatable_la.qm" +) + +qt_add_resource(tst_qjsengine "qjsengine" + PREFIX + "/" + FILES + ${qjsengine_resource_files} +) +set(qmake_immediate_resource_files + "exporterror1.mjs" + "importerror1.mjs" + "modulewithlexicals.mjs" + "testmodule.mjs" +) + +qt_add_resource(tst_qjsengine "qmake_immediate" + PREFIX + "/" + FILES + ${qmake_immediate_resource_files} +) + + +## Scopes: +##################################################################### diff --git a/tests/auto/qml/qjsengine/CMakeLists.txt b/tests/auto/qml/qjsengine/CMakeLists.txt index 6b6b12399c..49cba69620 100644 --- a/tests/auto/qml/qjsengine/CMakeLists.txt +++ b/tests/auto/qml/qjsengine/CMakeLists.txt @@ -16,7 +16,6 @@ qt_add_test(tst_qjsengine SOURCES tst_qjsengine.cpp PUBLIC_LIBRARIES - Qt::Core Qt::Gui Qt::GuiPrivate Qt::Qml diff --git a/tests/auto/qml/qjsvalue/.prev_CMakeLists.txt b/tests/auto/qml/qjsvalue/.prev_CMakeLists.txt new file mode 100644 index 0000000000..74789968d3 --- /dev/null +++ b/tests/auto/qml/qjsvalue/.prev_CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from qjsvalue.pro. + +##################################################################### +## tst_qjsvalue Test: +##################################################################### + +qt_add_test(tst_qjsvalue + SOURCES + tst_qjsvalue.cpp tst_qjsvalue.h + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate + Qt::Qml + Qt::QmlPrivate + Qt::Widgets +) + +## Scopes: +##################################################################### |