AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1617891528

Browse Source
This commit is contained in:
Qt CI Bot 2021-04-08 19:49:42 +00:00
commit 4e9f6abd62
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/QtPluginHelpers.cmake
View File

@ -212,11 +212,15 @@ function(qt_internal_add_plugin target)
endif() endif()
endif() endif()
add_dependencies(qt_plugins "${target}") if(TARGET qt_plugins)
add_dependencies(qt_plugins "${target}")
endif()
if(arg_TYPE STREQUAL "platforms") if(arg_TYPE STREQUAL "platforms")
add_dependencies(qpa_plugins "${target}") if(TARGET qpa_plugins)
add_dependencies(qpa_plugins "${target}")
endif()
if(_default_plugin) if(_default_plugin AND TARGET qpa_default_plugins)
add_dependencies(qpa_default_plugins "${target}") add_dependencies(qpa_default_plugins "${target}")
endif() endif()
endif() endif()

3
src/plugins/sqldrivers/CMakeLists.txt
View File

@ -16,9 +16,6 @@ if (NOT CMAKE_PROJECT_NAME STREQUAL "QtBase" AND NOT CMAKE_PROJECT_NAME STREQUAL
Sql Sql
) )
qt_prepare_standalone_project() qt_prepare_standalone_project()
# needed by qt_internal_add_plugin
add_custom_target(qt_plugins)
else() else()
qt_internal_upgrade_cmake_policies() qt_internal_upgrade_cmake_policies()
endif() endif()