diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-13 23:27:47 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-13 23:29:51 +0100 |
| commit | c53ee1f054fee2d6092c5e24b5b6b131dbd0457b (patch) | |
| tree | ffdc87c81c72b545602c7380bbde3f0ab5c499e0 /src | |
| parent | 60feaae1967aca5c7b1b0f6cb732962ddd1b2115 (diff) | |
| parent | 0d177053b9406e2fb21802d23f2b2cdc0f974377 (diff) | |
Merge remote-tracking branch 'origin/wip/cmake' into dev
Conflicts:
tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt
Hopefully final merge from wip/cmake, and then all cmake changes
should target dev directly.
Change-Id: I29b04c9b0284e97334877c77a32ffdf887dbf95b
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/Qt6CoreMacros.cmake | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/.prev_CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/CMakeLists.txt | 8 |
3 files changed, 18 insertions, 2 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 94d270b739..c4c2ee14e3 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -737,6 +737,10 @@ function(qt6_generate_meta_types_json_file target) file(MAKE_DIRECTORY "${target_binary_dir}/meta_types") file(TOUCH ${metatypes_file}) endif() + if (arg_COPY_OVER_INSTALL AND NOT EXISTS ${arg_INSTALL_DIR}/${metatypes_file_name}) + file(MAKE_DIRECTORY "${arg_INSTALL_DIR}") + file(TOUCH "${arg_INSTALL_DIR}/${metatypes_file_name}") + endif() add_custom_command(OUTPUT ${metatypes_file_gen} ${metatypes_file} DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::moc ${automoc_dependencies} ${manual_dependencies} COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::moc diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt index 57b7fede9f..299dda24af 100644 --- a/src/plugins/platforms/windows/.prev_CMakeLists.txt +++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt @@ -122,7 +122,13 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan Qt::VulkanSupportPrivate ) -#### Keys ignored in scope 5:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3 + DEFINES + QT_USE_DIRECTWRITE2 + QT_USE_DIRECTWRITE3 +) + +#### Keys ignored in scope 6:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2 diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index 0c903d8757..81a8c3bfe9 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -123,7 +123,13 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan Qt::VulkanSupportPrivate ) -#### Keys ignored in scope 5:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3 + DEFINES + QT_USE_DIRECTWRITE2 + QT_USE_DIRECTWRITE3 +) + +#### Keys ignored in scope 6:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2 |