diff options
Diffstat (limited to 'src/gui/CMakeLists.txt')
| -rw-r--r-- | src/gui/CMakeLists.txt | 213 |
1 files changed, 107 insertions, 106 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 9f0b07d929..ab1b3884cb 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -45,7 +45,8 @@ endif() # special case end -add_qt_module(Gui +qt_add_module(Gui + GENERATE_METATYPES PLUGIN_TYPES platforms platforms/darwin xcbglintegrations platformthemes platforminputcontexts generic iconengines imageformats egldeviceintegrations FEATURE_DEPENDENCIES # special case: Qt::Network # special case: @@ -87,7 +88,6 @@ add_qt_module(Gui kernel/qinputmethod.cpp kernel/qinputmethod.h kernel/qinputmethod_p.h kernel/qinternalmimedata.cpp kernel/qinternalmimedata_p.h kernel/qkeymapper.cpp kernel/qkeymapper_p.h - kernel/qkeysequence.cpp kernel/qkeysequence.h kernel/qkeysequence_p.h kernel/qoffscreensurface.cpp kernel/qoffscreensurface.h kernel/qpaintdevicewindow.cpp kernel/qpaintdevicewindow.h kernel/qpaintdevicewindow_p.h kernel/qpalette.cpp kernel/qpalette.h @@ -119,7 +119,6 @@ add_qt_module(Gui kernel/qrasterwindow.cpp kernel/qrasterwindow.h kernel/qscreen.cpp kernel/qscreen.h kernel/qscreen_p.h kernel/qsessionmanager.cpp kernel/qsessionmanager.h kernel/qsessionmanager_p.h - kernel/qshortcutmap.cpp kernel/qshortcutmap_p.h kernel/qstylehints.cpp kernel/qstylehints.h kernel/qsurface.cpp kernel/qsurface.h kernel/qsurfaceformat.cpp kernel/qsurfaceformat.h @@ -263,6 +262,8 @@ add_qt_module(Gui ZLIB::ZLIB PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate NO_PCH_SOURCES # special case "painting/qdrawhelper.cpp" # special case PRECOMPILED_HEADER @@ -279,7 +280,7 @@ set(qpdf_resource_files "qpdfa_metadata.xml" ) -add_qt_resource(Gui "qpdf" +qt_add_resource(Gui "qpdf" PREFIX "/qpdf/" BASE @@ -287,30 +288,18 @@ add_qt_resource(Gui "qpdf" FILES ${qpdf_resource_files} ) -set(qmake_webgradients_resource_files - "painting/webgradients.binaryjson" -) - -add_qt_resource(Gui "qmake_webgradients" - PREFIX - "/qgradient/" # special case - #BASE # special case remove - #"painting" # special case remove - FILES - ${qmake_webgradients_resource_files} -) # special case begin # Replace arch_haswell with avx2 feature. That is what is used in the code requireing # this file, too! -add_qt_simd_part(Gui SIMD avx2 +qt_add_simd_part(Gui SIMD avx2 SOURCES painting/qdrawhelper_avx2.cpp ) # special case end # special case begin -extend_target(Gui CONDITION QT_FEATURE_standarditemmodel +qt_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel SOURCES itemmodels/qstandarditemmodel.cpp itemmodels/qstandarditemmodel.h itemmodels/qstandarditemmodel_p.h ) @@ -321,7 +310,6 @@ extend_target(Gui CONDITION QT_FEATURE_standarditemmodel # MODULE_PLUGIN_TYPES = "platforms" "platforms/darwin" "xcbglintegrations" "platformthemes" "platforminputcontexts" "generic" "iconengines" "imageformats" "egldeviceintegrations" # QMAKE_DYNAMIC_LIST_FILE = "$$PWD/QtGui.dynlist" # QMAKE_LIBS = "$$QMAKE_LIBS_GUI" -# _LOADED = "qt_module" "cmake_functions" ## Scopes: ##################################################################### @@ -332,7 +320,7 @@ extend_target(Gui CONDITION QT_FEATURE_standarditemmodel # on the opengl _feature_. This is done by hand now here (where the # feature is available). # DO NOT MOVE THIS TO THE BEGINNING OF THE FILE, the feature variables are not -# available until the add_qt_module call. +# available until the qt_add_module call. if(QT_FEATURE_opengl) if(QT_FEATURE_opengles2) find_package(GLESv2) @@ -344,35 +332,18 @@ if(QT_FEATURE_opengl) endif() # special case end -extend_target(Gui CONDITION QT_FEATURE_opengl +qt_extend_target(Gui CONDITION QT_FEATURE_opengl SOURCES kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h - kernel/qopenglwindow.cpp kernel/qopenglwindow.h kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h - opengl/qopengl2pexvertexarray.cpp opengl/qopengl2pexvertexarray_p.h opengl/qopenglbuffer.cpp opengl/qopenglbuffer.h - opengl/qopenglcustomshaderstage.cpp opengl/qopenglcustomshaderstage_p.h - opengl/qopengldebug.cpp opengl/qopengldebug.h - opengl/qopenglengineshadermanager.cpp opengl/qopenglengineshadermanager_p.h - opengl/qopenglengineshadersource_p.h opengl/qopenglextensions_p.h opengl/qopenglextrafunctions.h opengl/qopenglframebufferobject.cpp opengl/qopenglframebufferobject.h opengl/qopenglframebufferobject_p.h opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h - opengl/qopenglgradientcache.cpp opengl/qopenglgradientcache_p.h - opengl/qopenglpaintdevice.cpp opengl/qopenglpaintdevice.h opengl/qopenglpaintdevice_p.h - opengl/qopenglpaintengine.cpp opengl/qopenglpaintengine_p.h - opengl/qopenglpixeltransferoptions.cpp opengl/qopenglpixeltransferoptions.h opengl/qopenglprogrambinarycache.cpp opengl/qopenglprogrambinarycache_p.h - opengl/qopenglshadercache_p.h opengl/qopenglshaderprogram.cpp opengl/qopenglshaderprogram.h - opengl/qopengltexture.cpp opengl/qopengltexture.h opengl/qopengltexture_p.h - opengl/qopengltextureblitter.cpp opengl/qopengltextureblitter.h - opengl/qopengltexturecache.cpp opengl/qopengltexturecache_p.h - opengl/qopengltextureglyphcache.cpp opengl/qopengltextureglyphcache_p.h - opengl/qopengltexturehelper.cpp opengl/qopengltexturehelper_p.h - opengl/qopengltextureuploader.cpp opengl/qopengltextureuploader_p.h opengl/qopenglversionfunctions.cpp opengl/qopenglversionfunctions.h opengl/qopenglversionfunctionsfactory.cpp opengl/qopenglversionfunctionsfactory_p.h opengl/qopenglvertexarrayobject.cpp opengl/qopenglvertexarrayobject.h @@ -386,21 +357,14 @@ extend_target(Gui CONDITION QT_FEATURE_opengl #### Keys ignored in scope 3:.:.:gui.pro:QT_FEATURE_angle: # MODULE_AUX_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/QtANGLE" -#### Keys ignored in scope 4:.:.:gui.pro:testcocoon: -# _LOADED = "testcocoon" - -extend_target(Gui CONDITION APPLE_OSX - SOURCES - rhi/qrhimetal.mm rhi/qrhimetal_p.h - rhi/qrhimetal_p_p.h +qt_extend_target(Gui CONDITION APPLE_OSX LIBRARIES ${FWAppKit} PUBLIC_LIBRARIES ${FWAppKit} - ${FWMetal} ) -extend_target(Gui CONDITION APPLE +qt_extend_target(Gui CONDITION APPLE SOURCES image/qimage_darwin.mm painting/qcoregraphics.mm painting/qcoregraphics_p.h @@ -408,12 +372,12 @@ extend_target(Gui CONDITION APPLE ${FWCoreGraphics} ) -extend_target(Gui CONDITION QT_FEATURE_animation +qt_extend_target(Gui CONDITION QT_FEATURE_animation SOURCES animation/qguivariantanimation.cpp ) -extend_target(Gui CONDITION WIN32 +qt_extend_target(Gui CONDITION WIN32 SOURCES kernel/qwindowdefs_win.h rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h @@ -465,7 +429,7 @@ extend_target(Gui CONDITION WIN32 #### Keys ignored in scope 22:.:.:gui.pro:QT_FEATURE_egl: # CMAKE_EGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_EGL)" -extend_target(Gui CONDITION QT_FEATURE_accessibility +qt_extend_target(Gui CONDITION QT_FEATURE_accessibility SOURCES accessible/qaccessible.cpp accessible/qaccessible.h accessible/qaccessiblebridge.cpp accessible/qaccessiblebridge.h @@ -475,14 +439,20 @@ extend_target(Gui CONDITION QT_FEATURE_accessibility accessible/qplatformaccessibility.cpp accessible/qplatformaccessibility.h ) -extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility +qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility SOURCES accessible/qaccessiblecache_mac.mm LIBRARIES ${FWFoundation} ) -extend_target(Gui CONDITION QT_FEATURE_draganddrop +qt_extend_target(Gui CONDITION QT_FEATURE_action + SOURCES + kernel/qguiaction.cpp kernel/qguiaction.h kernel/qguiaction_p.h + kernel/qguiactiongroup.cpp kernel/qguiactiongroup.h kernel/qguiactiongroup_p.h +) + +qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop SOURCES kernel/qdnd.cpp kernel/qdnd_p.h kernel/qdrag.cpp kernel/qdrag.h @@ -491,76 +461,91 @@ extend_target(Gui CONDITION QT_FEATURE_draganddrop kernel/qsimpledrag.cpp kernel/qsimpledrag_p.h ) -extend_target(Gui CONDITION QT_FEATURE_movie +qt_extend_target(Gui CONDITION QT_FEATURE_shortcut + SOURCES + kernel/qguishortcut.cpp kernel/qguishortcut.h kernel/qguishortcut_p.h + kernel/qkeysequence.cpp kernel/qkeysequence.h kernel/qkeysequence_p.h + kernel/qshortcutmap.cpp kernel/qshortcutmap_p.h +) + +qt_extend_target(Gui CONDITION QT_FEATURE_movie SOURCES image/qmovie.cpp image/qmovie.h ) -extend_target(Gui CONDITION WIN32 AND NOT WINRT +qt_extend_target(Gui CONDITION WIN32 AND NOT WINRT SOURCES image/qpixmap_win.cpp ) -extend_target(Gui CONDITION QT_FEATURE_png +qt_extend_target(Gui CONDITION QT_FEATURE_png SOURCES image/qpnghandler.cpp image/qpnghandler_p.h LIBRARIES PNG::PNG ) +#### Keys ignored in scope 38:.:image:image/image.pri:WIN32 AND mingw: +# GCC_VERSION = "$${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.$${QMAKE_GCC_PATCH_VERSION}" + +qt_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND mingw)) AND (GCC_VERSION___equals___8.1.0) + COMPILE_OPTIONS + -fno-reorder-blocks-and-partition +) + if(NOT ANDROID) - add_qt_simd_part(Gui SIMD sse2 + qt_add_simd_part(Gui SIMD sse2 SOURCES painting/qdrawhelper_sse2.cpp ) - add_qt_simd_part(Gui SIMD ssse3 + qt_add_simd_part(Gui SIMD ssse3 SOURCES image/qimage_ssse3.cpp painting/qdrawhelper_ssse3.cpp ) - add_qt_simd_part(Gui SIMD sse4_1 + qt_add_simd_part(Gui SIMD sse4_1 SOURCES painting/qdrawhelper_sse4.cpp painting/qimagescale_sse4.cpp ) - add_qt_simd_part(Gui SIMD neon + qt_add_simd_part(Gui SIMD neon SOURCES image/qimage_neon.cpp painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h painting/qimagescale_neon.cpp ) - add_qt_simd_part(Gui SIMD mips_dsp + qt_add_simd_part(Gui SIMD mips_dsp SOURCES painting/qdrawhelper_mips_dsp.cpp painting/qdrawhelper_mips_dsp_p.h painting/qdrawhelper_mips_dsp_asm.S painting/qt_mips_asm_dsp_p.h ) - add_qt_simd_part(Gui SIMD mips_dspr2 + qt_add_simd_part(Gui SIMD mips_dspr2 SOURCES image/qimage_mips_dspr2.cpp image/qimage_mips_dspr2_asm.S painting/qdrawhelper_mips_dspr2_asm.S ) - add_qt_simd_part(Gui SIMD arch_haswell + qt_add_simd_part(Gui SIMD arch_haswell SOURCES painting/qdrawhelper_avx2.cpp ) endif() -extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL arm64 +qt_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL arm64 SOURCES image/qimage_neon.cpp painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h painting/qimagescale_neon.cpp ) -extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL x86 OR TEST_architecture_arch STREQUAL x86_64) +qt_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL i386 OR TEST_architecture_arch STREQUAL x86_64) SOURCES image/qimage_ssse3.cpp painting/qdrawhelper_sse2.cpp @@ -580,14 +565,24 @@ if (MINGW AND CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 8.1.0) endif() # special case end -extend_target(Gui CONDITION QT_FEATURE_harfbuzz +qt_extend_target(Gui CONDITION QT_FEATURE_harfbuzz SOURCES text/qharfbuzzng.cpp text/qharfbuzzng_p.h LIBRARIES - harfbuzz::harfbuzz + WrapHarfbuzz::WrapHarfbuzz ) -extend_target(Gui CONDITION QT_FEATURE_textodfwriter +# special case begin +# Replicate what src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro does, which is link CoreText +# when targeting uikit. + +qt_extend_target(Gui CONDITION QT_FEATURE_harfbuzz AND APPLE_UIKIT + LIBRARIES + ${FWCoreText} +) +# special case end + +qt_extend_target(Gui CONDITION QT_FEATURE_textodfwriter SOURCES text/qtextodfwriter.cpp text/qtextodfwriter_p.h text/qzip.cpp @@ -595,48 +590,48 @@ extend_target(Gui CONDITION QT_FEATURE_textodfwriter text/qzipwriter_p.h ) -extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader +qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader SOURCES text/qtextmarkdownimporter.cpp text/qtextmarkdownimporter_p.h ) -extend_target(Gui CONDITION QT_FEATURE_system_textmarkdownreader AND QT_FEATURE_textmarkdownreader +qt_extend_target(Gui CONDITION QT_FEATURE_system_textmarkdownreader AND QT_FEATURE_textmarkdownreader PUBLIC_LIBRARIES libmd4c ) -extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_system_textmarkdownreader +qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_system_textmarkdownreader SOURCES ../3rdparty/md4c/md4c.c ../3rdparty/md4c/md4c.h INCLUDE_DIRECTORIES ../3rdparty/md4c ) -extend_target(Gui CONDITION QT_FEATURE_textmarkdownwriter +qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownwriter SOURCES text/qtextmarkdownwriter.cpp text/qtextmarkdownwriter_p.h ) -extend_target(Gui CONDITION QT_FEATURE_cssparser +qt_extend_target(Gui CONDITION QT_FEATURE_cssparser SOURCES painting/qcssutil.cpp text/qcssparser.cpp text/qcssparser_p.h ) -extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") +qt_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64") DEFINES ENABLE_PIXMAN_DRAWHELPERS ) if(UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")) - add_qt_simd_part(Gui SIMD neon + qt_add_simd_part(Gui SIMD neon SOURCES ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S ) endif() -extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64 +qt_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64 SOURCES painting/qdrawhelper_sse4.cpp painting/qimagescale_sse4.cpp @@ -645,20 +640,12 @@ extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64 QT_COMPILER_SUPPORTS_SSE4_2 ) -# special case begin -extend_target(Gui CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64" AND QT_FEATURE_neon) - SOURCES - ../3rdparty/pixman/pixman-arm-neon-asm.S - painting/qdrawhelper_neon_asm.S -) -# special case end - -extend_target(Gui CONDITION QT_FEATURE_regularexpression +qt_extend_target(Gui CONDITION QT_FEATURE_regularexpression SOURCES util/qshadergenerator.cpp util/qshadergenerator_p.h ) -extend_target(Gui CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 +qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 SOURCES opengl/qopenglfunctions_1_0.cpp opengl/qopenglfunctions_1_0.h opengl/qopenglfunctions_1_1.cpp opengl/qopenglfunctions_1_1.h @@ -686,11 +673,9 @@ extend_target(Gui CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 opengl/qopenglfunctions_4_4_core.cpp opengl/qopenglfunctions_4_4_core.h opengl/qopenglfunctions_4_5_compatibility.cpp opengl/qopenglfunctions_4_5_compatibility.h opengl/qopenglfunctions_4_5_core.cpp opengl/qopenglfunctions_4_5_core.h - opengl/qopenglqueryhelper_p.h - opengl/qopengltimerquery.cpp opengl/qopengltimerquery.h ) -extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_opengles2 +qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_opengles2 SOURCES opengl/qopenglfunctions_es2.cpp opengl/qopenglfunctions_es2.h ) @@ -703,7 +688,7 @@ if(TARGET Vulkan::Vulkan) endif() # special case end -extend_target(Gui CONDITION QT_FEATURE_vulkan +qt_extend_target(Gui CONDITION QT_FEATURE_vulkan SOURCES rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h rhi/qrhivulkan_p_p.h @@ -715,26 +700,24 @@ extend_target(Gui CONDITION QT_FEATURE_vulkan Vulkan::Vulkan_nolink ) +#### Keys ignored in scope 82:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen: # special case begin +# We must always generate syncqt-injected header files, +# because we added a custom command earlier for those for framework builds. +set(vulkan_fun "qvulkanfunctions.h") +set(vulkan_fun_p "qvulkanfunctions_p.h") +set(vulkan_fun_outputs "vulkan/${vulkan_fun}" "vulkan/${vulkan_fun_p}") +set(vulkan_fun_command_content COMMAND "${CMAKE_COMMAND}" -E make_directory "vulkan") if (QT_FEATURE_vulkan) - set(qvkgen_command "${HOST_QVKGEN}") - if (TARGET qvkgen) - set(qvkgen_command qvkgen) - endif() - - set(vulkan_fun "qvulkanfunctions.h") - set(vulkan_fun_p "qvulkanfunctions_p.h") set(vulkan_fun_p_cpp "qvulkanfunctions_p.cpp") + list(APPEND vulkan_fun_outputs "vulkan/${vulkan_fun_p_cpp}") - add_custom_command( - OUTPUT "vulkan/${vulkan_fun}" "vulkan/${vulkan_fun_p}" "vulkan/${vulkan_fun_p_cpp}" - COMMAND "${CMAKE_COMMAND}" -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vulkan/" - COMMAND "${qvkgen_command}" + list(APPEND vulkan_fun_command_content + COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qvkgen "${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vk.xml" "${PROJECT_SOURCE_DIR}/header.LGPL" "${CMAKE_CURRENT_BINARY_DIR}/vulkan/qvulkanfunctions" DEPENDS vulkan/vk.xml - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" COMMENT "Generating vulkan data" ) @@ -744,7 +727,17 @@ if (QT_FEATURE_vulkan) "${CMAKE_CURRENT_BINARY_DIR}/vulkan/${vulkan_fun_p}" "${CMAKE_CURRENT_BINARY_DIR}/vulkan/${vulkan_fun_p_cpp}" ) +else() + foreach(file ${vulkan_fun_outputs}) + list(APPEND vulkan_fun_command_content + COMMAND "${CMAKE_COMMAND}" -E touch "${file}") + endforeach() endif() +add_custom_command( + OUTPUT ${vulkan_fun_outputs} + ${vulkan_fun_command_content} + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" +) # special case end #### Keys ignored in scope 68:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen: @@ -763,18 +756,26 @@ endif() # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT" # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp" -#### Keys ignored in scope 79:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: +#### Keys ignored in scope 83:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: # qvkgen_h.variable_out = "HEADERS" -#### Keys ignored in scope 80:.:vulkan:vulkan/vulkan.pri:else: +#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:else: # qvkgen_h.CONFIG = "target_predeps" "no_link" -extend_target(Gui CONDITION WASM +qt_extend_target(Gui CONDITION WASM SOURCES platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h ) -extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5 +qt_extend_target(Gui CONDITION APPLE_IOS OR APPLE_OSX + SOURCES + rhi/qrhimetal.mm rhi/qrhimetal_p.h + rhi/qrhimetal_p_p.h + PUBLIC_LIBRARIES + ${FWMetal} +) + +qt_extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5 SOURCES painting/qdrawhelper.cpp NO_PCH_SOURCES @@ -783,7 +784,7 @@ extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5 qt_create_tracepoints(Gui qtgui.tracepoints) -add_qt_docs(Gui +qt_add_docs(Gui doc/qtgui.qdocconf ) |