qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Make find_package for qmlsc look only in host qt" 

This reverts commit 80cb4091d6.

Reason for revert: QTBUG-105488

Change-Id: Icead8f91349e3a57ca455b0a39ffa93caddda947
Pick-to: 6.4 6.3
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Jani Heikkinen 2022-08-09 06:30:36 +00:00
parent 59cb659b5c
commit 090f07a503
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qml/Qt6QmlFindQmlscInternal.cmake
View File

@ -6,23 +6,6 @@ if (QT_NO_FIND_QMLSC)
endif() endif()
set(QT_NO_FIND_QMLSC TRUE) set(QT_NO_FIND_QMLSC TRUE)
if(NOT "${QT_HOST_PATH}" STREQUAL "")
# Make sure that the tools find the host tools and does not try the target
set(BACKUP_qmlsc_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})
set(BACKUP_qmlsc_CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH})
set(BACKUP_qmlsc_CMAKE_SYSROOT ${CMAKE_SYSROOT})
set(CMAKE_PREFIX_PATH "${QT_HOST_PATH_CMAKE_DIR}")
list(APPEND CMAKE_PREFIX_PATH "${_qt_additional_host_packages_prefix_paths}")
set(CMAKE_FIND_ROOT_PATH "${QT_HOST_PATH}")
list(APPEND CMAKE_FIND_ROOT_PATH "${_qt_additional_host_packages_root_paths}")
unset(CMAKE_SYSROOT)
endif()
# FIXME: Make this work with cross-builds
find_package(Qt6QmlCompilerPlusPrivate QUIET) find_package(Qt6QmlCompilerPlusPrivate QUIET)
if(NOT "${QT_HOST_PATH}" STREQUAL "")
set(CMAKE_PREFIX_PATH ${BACKUP_qmlsc_CMAKE_PREFIX_PATH})
set(CMAKE_FIND_ROOT_PATH ${BACKUP_qmlsc_CMAKE_FIND_ROOT_PATH})
set(CMAKE_SYSROOT ${BACKUP_qmlsc_CMAKE_SYSROOT})
endif()