From f59873171453b4ddb761210ad108cff2c6e1837a Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Mon, 30 Jun 2025 17:13:32 +0800 Subject: [PATCH] Qt4 compat --- CMakeLists.txt | 1 - cmake/FindInstallConfigPath.cmake | 4 +--- cmake/modules/LXQtTranslateTs.cmake.in | 6 ++---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git CMakeLists.txt CMakeLists.txt index ff3af7c..e3f1d74 100644 --- CMakeLists.txt +++ CMakeLists.txt @@ -12,7 +12,6 @@ set(LXQT_BUILD_TOOLS_MAJOR_VERSION 0) set(LXQT_BUILD_TOOLS_MINOR_VERSION 13) set(LXQT_BUILD_TOOLS_PATCH_VERSION 0) set(LXQT_BUILD_TOOLS_VERSION ${LXQT_BUILD_TOOLS_MAJOR_VERSION}.${LXQT_BUILD_TOOLS_MINOR_VERSION}.${LXQT_BUILD_TOOLS_PATCH_VERSION}) -set(LXQT_MIN_LINGUIST_VERSION "5.15.0") include(CMakePackageConfigHelpers) include(GNUInstallDirs) # Standard directories for installation diff --git cmake/FindInstallConfigPath.cmake cmake/FindInstallConfigPath.cmake index e995c7a..c39011c 100644 --- cmake/FindInstallConfigPath.cmake +++ cmake/FindInstallConfigPath.cmake @@ -5,10 +5,9 @@ # qmake -query QT_INSTALL_CONFIGURATION # -find_package(Qt5Core REQUIRED) +find_package(Qt4 COMPONENTS QtCore REQUIRED) if(NOT DEFINED LXQT_ETC_XDG_DIR) - get_target_property(QT_QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE} IMPORTED_LOCATION) message(STATUS "${QT_QMAKE_EXECUTABLE}") if(NOT QT_QMAKE_EXECUTABLE) @@ -23,4 +22,3 @@ if(NOT DEFINED LXQT_ETC_XDG_DIR) message(STATUS "You can set it manually with -DLXQT_ETC_XDG_DIR=") message(STATUS "") endif () - diff --git cmake/modules/LXQtTranslateTs.cmake.in cmake/modules/LXQtTranslateTs.cmake.in index 7f0eed2..b5a74e6 100644 --- cmake/modules/LXQtTranslateTs.cmake.in +++ cmake/modules/LXQtTranslateTs.cmake.in @@ -62,11 +62,9 @@ # present. Defaults to "Runtime". # -find_package(Qt5LinguistTools "@LXQT_MIN_LINGUIST_VERSION@" REQUIRED) - function(lxqt_translate_ts qmFiles) set(oneValueArgs - USE_QT5 + USE_QT4 UPDATE_TRANSLATIONS TEMPLATE TRANSLATION_DIR @@ -85,7 +83,7 @@ function(lxqt_translate_ts qmFiles) endif() if (NOT DEFINED TR_USE_QT5) - set(TR_USE_QT5 "Yes") + set(TR_USE_QT5 "No") endif() if(NOT DEFINED TR_TEMPLATE) -- 2.49.0