diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-01-19 12:02:19 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-24 12:01:00 +0000 |
| commit | 2c85dcb5c096bd58dd2b685a8e4466cbb863b563 (patch) | |
| tree | 58500d259db3167e3dfc1f3012a94910231a501f /tests | |
| parent | fbbe5f294669043e7afef621912c8bb42f6e2ec7 (diff) | |
CMake: Don't cross-compile qjtest
Previously it was only excluded on ANDROID, but cross-compiled for
other platforms.
The executable should only be built when the target Qt is meant
to be used as a development SDK, to be executed on some host machine.
Because at the moment we lack a proper abstraction for that, as a work
around, we exclude building it when cross-compiling.
The executable is not called automatically by any test, it is only run
manually by a developer.
In the future, the qt_internal_add_tool call should likely be replaced
by a customized qt_internal_add_app call, installing the executable
into $prefix/libexec rather than $prefix/bin.
Amends 5a55e526382f0bb6eb647c2e6b7ce55661889990
Task-number: QTBUG-92591
Task-number: QTBUG-100040
Task-number: QTBUG-100047
Change-Id: If20e73fe378acd51fe41d181078d273a7842fc81
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 0de113d37924b7403b74eea4a92fe2b62c557247)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml/ecmascripttests/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qml/ecmascripttests/CMakeLists.txt b/tests/auto/qml/ecmascripttests/CMakeLists.txt index c891e97c4b..078881c41a 100644 --- a/tests/auto/qml/ecmascripttests/CMakeLists.txt +++ b/tests/auto/qml/ecmascripttests/CMakeLists.txt @@ -13,6 +13,6 @@ qt_internal_add_test(tst_ecmascripttests ) set_property(TEST tst_ecmascripttests APPEND PROPERTY ENVIRONMENT "QTEST_FUNCTION_TIMEOUT=900000") -if(NOT ANDROID) # FIXME: QTBUG-92591 -add_subdirectory(qjstest) +if(NOT CMAKE_CROSSCOMPILING) + add_subdirectory(qjstest) endif() |