|
| 1 | +From 8bb2a0c02b305f8ae8611e501fe7dd3d2b4468a6 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Joerg Bornemann < [email protected]> |
| 3 | +Date: Tue, 11 Jun 2024 10:47:18 +0200 |
| 4 | +Subject: [PATCH] CMake: Re-enable lupdate/lconvert/lrelease in no-gui builds |
| 5 | + |
| 6 | +This reverts 8dba0e48a0f7d3487b318a74f80f2d8e59c320f9 which disabled the |
| 7 | +'linguist' feature if the 'printsupport' feature wasn't available. |
| 8 | +However, the 'linguist' feature controls not only the Qt Linguist |
| 9 | +application but also the command line tools lupdate, lconvert, and |
| 10 | +lrelease. In no-gui builds, which also disable printsupport, the command |
| 11 | +line tools were unexpectedly missing. |
| 12 | + |
| 13 | +Fix the issue by extending the feature condition in |
| 14 | +src/linguist/CMakeLists.txt. As drive-by, fix the FEATURE_png condition |
| 15 | +that was still in QMake form from the initial conversion. |
| 16 | + |
| 17 | +Fixes: QTBUG-126189 |
| 18 | +Task-number: QTBUG-125066 |
| 19 | +Change-Id: I59ebb82fd5823165b307ffbc967d7fd89a071ede |
| 20 | +Reviewed-by: Alexey Edelev < [email protected]> |
| 21 | +Reviewed-by: Alexandru Croitor < [email protected]> |
| 22 | +(cherry picked from commit 4be1823e4d459c89717e791ef27fd463ad04cb2b) |
| 23 | +Reviewed-by: Qt Cherry-pick Bot < [email protected]> |
| 24 | +(cherry picked from commit aa9f8db49db2e7734c187445b8c3c56768f6e546) |
| 25 | +--- |
| 26 | + configure.cmake | 1 - |
| 27 | + src/linguist/CMakeLists.txt | 3 ++- |
| 28 | + 2 files changed, 2 insertions(+), 2 deletions(-) |
| 29 | + |
| 30 | +diff --git a/configure.cmake b/configure.cmake |
| 31 | +index 813789e9f7..7d9ab8724f 100644 |
| 32 | +--- a/configure.cmake |
| 33 | ++++ b/configure.cmake |
| 34 | +@@ -74,7 +74,6 @@ qt_feature("kmap2qmap" PRIVATE |
| 35 | + qt_feature("linguist" PRIVATE |
| 36 | + LABEL "Qt Linguist" |
| 37 | + PURPOSE "Qt Linguist can be used by translator to translate text in Qt applications." |
| 38 | +- CONDITION TARGET Qt::PrintSupport |
| 39 | + ) |
| 40 | + qt_feature("pixeltool" PRIVATE |
| 41 | + LABEL "pixeltool" |
| 42 | +diff --git a/src/linguist/CMakeLists.txt b/src/linguist/CMakeLists.txt |
| 43 | +index ab2169dec5..20ec247337 100644 |
| 44 | +--- a/src/linguist/CMakeLists.txt |
| 45 | ++++ b/src/linguist/CMakeLists.txt |
| 46 | +@@ -14,7 +14,8 @@ add_subdirectory(lrelease) |
| 47 | + add_subdirectory(lrelease-pro) |
| 48 | + add_subdirectory(lupdate) |
| 49 | + add_subdirectory(lupdate-pro) |
| 50 | +-if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND NOT no-png) |
| 51 | ++if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton |
| 52 | ++ AND QT_FEATURE_png AND QT_FEATURE_printsupport AND TARGET Qt::Widgets) |
| 53 | + add_subdirectory(linguist) |
| 54 | + endif() |
| 55 | + |
| 56 | +-- |
| 57 | +2.16.3 |
0 commit comments