diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-12 01:00:49 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-12 01:00:50 +0100 |
| commit | 9a5df00a6119f415c1a8fde51d1cecf1a9fb26ee (patch) | |
| tree | 704f8b264d147efeeee3ce16b9abae679969e452 /mkspecs/features/data | |
| parent | 4e796e0b0dcf4c0848044471021db3afce16ee5d (diff) | |
| parent | dd04fb639bf357e66d0586faed78a3043a62819e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I8caee4d1ce0eed27d905194df3c3d46c5d07d2b0
Diffstat (limited to 'mkspecs/features/data')
| -rw-r--r-- | mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in index 2b56e1d369..4c3086a1f6 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -111,7 +111,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura if(current_search_paths) find_library(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH ${_lib} HINTS ${current_search_paths} NO_DEFAULT_PATH) endif() - find_library(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH ${_lib}) + find_library(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH ${_lib} HINTS ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES}) mark_as_advanced(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH) if(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH) list(APPEND _lib_deps |