summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2020-11-09 08:01:29 +0100
committerKai Koehne <kai.koehne@qt.io>2020-11-09 13:58:51 +0100
commita213ac05a231a2fd1443768d99b94d9efb684687 (patch)
treee1c72e0e2e179853b3cf73f1d53ac1f0c215ec38
parent633505bc5490d174ac3985fb5e195b4e742b987b (diff)
Unblock -developer-build in qt5.git
LinguistTools is not created yet when the cmake test is configured, resulting in -- Could NOT find Qt6LinguistTools (missing: Qt6LinguistTools_DIR) CMake Error at qttools/tests/auto/cmake/linguist/CMakeLists.txt:38 (find_package): Found package configuration file: /home/qt/depot/qt5/qtbase/lib/cmake/Qt6/Qt6Config.cmake but it set Qt6_FOUND to FALSE so package "Qt6" is considered to be NOT FOUND. Reason given by package: Failed to find Qt component "LinguistTools" config file at "" Work around this by explicitly disabling the autotest. Fixes: QTBUG-88264 Change-Id: I7712098dbe58cefbabf8825058ca42b2f34135f6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--tests/auto/CMakeLists.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 63435e9eb..21c34df0b 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -16,10 +16,10 @@ if(TARGET Qt::Help AND NOT CMAKE_CROSSCOMPILING)
add_subdirectory(qhelpprojectdata)
endif()
# special case begin
-add_subdirectory(cmake)
-if (TARGET Qt::Linguist)
- add_subdirectory(cmake/linguist)
-endif()
+# add_subdirectory(cmake)
+# if (TARGET Qt::Linguist)
+# add_subdirectory(cmake/linguist)
+# endif()
# special case end
if(QT_FEATURE_process AND WIN32 AND NOT CMAKE_CROSSCOMPILING)
add_subdirectory(windeployqt)