diff options
Diffstat (limited to 'src/gui/.prev_CMakeLists.txt')
| -rw-r--r-- | src/gui/.prev_CMakeLists.txt | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index 90b66fd882..75af1f1960 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -239,18 +239,6 @@ qt_add_resource(Gui "qpdf" FILES ${qpdf_resource_files} ) -set(qmake_webgradients_resource_files - "painting/webgradients.binaryjson" -) - -qt_add_resource(Gui "qmake_webgradients" - PREFIX - "qgradient" - BASE - "painting" - FILES - ${qmake_webgradients_resource_files} -) #### Keys ignored in scope 1:.:.:gui.pro:<TRUE>: @@ -263,13 +251,11 @@ qt_add_resource(Gui "qmake_webgradients" 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 @@ -303,14 +289,10 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl # MODULE_AUX_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/QtANGLE" qt_extend_target(Gui CONDITION APPLE_OSX - SOURCES - rhi/qrhimetal.mm rhi/qrhimetal_p.h - rhi/qrhimetal_p_p.h LIBRARIES ${FWAppKit} PUBLIC_LIBRARIES ${FWAppKit} - ${FWMetal} ) qt_extend_target(Gui CONDITION APPLE @@ -434,6 +416,14 @@ qt_extend_target(Gui CONDITION QT_FEATURE_png 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) qt_add_simd_part(Gui SIMD sse2 SOURCES @@ -595,8 +585,6 @@ qt_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 ) qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_opengles2 @@ -616,7 +604,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan Vulkan::Vulkan_nolink ) -#### Keys ignored in scope 80:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen: +#### Keys ignored in scope 82:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen: # QMAKE_EXTRA_COMPILERS = "qvkgen_h" "qvkgen_ph" "qvkgen_pimpl" # QMAKE_QVKGEN_INPUT = "vulkan/vk.xml" # QMAKE_QVKGEN_LICENSE_HEADER = "$$QT_SOURCE_TREE/header.LGPL" @@ -632,10 +620,10 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT" # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp" -#### Keys ignored in scope 81:.: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 82:.:vulkan:vulkan/vulkan.pri:else: +#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:else: # qvkgen_h.CONFIG = "target_predeps" "no_link" qt_extend_target(Gui CONDITION WASM @@ -643,6 +631,14 @@ qt_extend_target(Gui CONDITION WASM platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h ) +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 |