diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-03-01 14:32:39 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-03-16 10:12:40 +0100 |
| commit | fb03ec4af4b403bbba7cf564eb6a625c24675b62 (patch) | |
| tree | 0ccbb3b9dbc260d7cdbba7e1ad9be5ec245abb12 | |
| parent | 4aba6db31495ba07226b93ddd601a6b38e2df0f9 (diff) | |
Fix build after moving uic/rcc to libexec
Grab uic/rcc from libexec for installation.
Task-number: QTBUG-88791
Task-number: PYSIDE-1518
Change-Id: I6d3c1298725c942e7705b747f49a152ce7ccdbec
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | build_scripts/platforms/unix.py | 4 | ||||
| -rw-r--r-- | sources/pyside-tools/CMakeLists.txt | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 21747ad62..6e2785be0 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -45,6 +45,7 @@ from .macos import prepare_standalone_package_macos from ..config import config from ..options import OPTION +from ..qtinfo import QtInfo from ..utils import copydir, copyfile, makefile from ..utils import regenerate_qt_resources from ..versions import PYSIDE, SHIBOKEN @@ -203,7 +204,8 @@ def prepare_packages_posix(self, vars): # Re-generate examples Qt resource files for Python 3 # compatibility examples_path = "{st_build_dir}/{st_package_name}/examples".format(**vars) - pyside_rcc_path = "rcc" + lib_execs_dir = QtInfo().lib_execs_dir + pyside_rcc_path = f"{lib_execs_dir}/rcc" pyside_rcc_options = ['-g', 'python'] regenerate_qt_resources(examples_path, pyside_rcc_path, pyside_rcc_options) diff --git a/sources/pyside-tools/CMakeLists.txt b/sources/pyside-tools/CMakeLists.txt index 3652a94c1..ce8fc86e5 100644 --- a/sources/pyside-tools/CMakeLists.txt +++ b/sources/pyside-tools/CMakeLists.txt @@ -6,12 +6,13 @@ if (QUIET_BUILD) set(CMAKE_INSTALL_MESSAGE NEVER) endif() -find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Core HostInfo) -set(TOOLS_PATH "${QT6_INSTALL_PREFIX}/bin") +set(TOOLS_PATH "${QT6_INSTALL_PREFIX}/${QT6_HOST_INFO_BINDIR}") +set(LIBEXEC_PATH "${QT6_INSTALL_PREFIX}/${QT6_HOST_INFO_LIBEXECDIR}") -set(UIC_PATH "${TOOLS_PATH}/uic${CMAKE_EXECUTABLE_SUFFIX}") -set(RCC_PATH "${TOOLS_PATH}/rcc${CMAKE_EXECUTABLE_SUFFIX}") +set(UIC_PATH "${LIBEXEC_PATH}/uic${CMAKE_EXECUTABLE_SUFFIX}") +set(RCC_PATH "${LIBEXEC_PATH}/rcc${CMAKE_EXECUTABLE_SUFFIX}") if (APPLE) set(DESIGNER_PATH "${TOOLS_PATH}/Designer.app") else() |