diff options
Diffstat (limited to 'src/gui/.prev_CMakeLists.txt')
| -rw-r--r-- | src/gui/.prev_CMakeLists.txt | 41 |
1 files changed, 16 insertions, 25 deletions
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index ed4b02c9fa..30a157e9ea 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -268,9 +268,6 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl #### Keys ignored in scope 2:.:.:gui.pro:QT_FEATURE_opengl: # MODULE_CONFIG = "opengl" -#### Keys ignored in scope 3:.:.:gui.pro:QT_FEATURE_angle: -# MODULE_AUX_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/QtANGLE" - qt_extend_target(Gui CONDITION MACOS LIBRARIES ${FWAppKit} @@ -302,50 +299,44 @@ qt_extend_target(Gui CONDITION WIN32 dxguid ) -#### Keys ignored in scope 8:.:.:gui.pro:WIN32: +#### Keys ignored in scope 7:.:.:gui.pro:WIN32: # CMAKE_WINDOWS_BUILD = "True" -#### Keys ignored in scope 10:.:.:gui.pro:NOT mingw OR QT_FEATURE_debug_and_release: -# debug_suffix = "d" - -#### Keys ignored in scope 12:.:.:gui.pro:QT_FEATURE_egl: +#### Keys ignored in scope 8:.:.:gui.pro:QT_FEATURE_egl: # CMAKE_EGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_EGL)" -#### Keys ignored in scope 13:.:.:gui.pro:NOT QMAKE_LIBDIR_EGL_ISEMPTY: +#### Keys ignored in scope 9:.:.:gui.pro:NOT QMAKE_LIBDIR_EGL_ISEMPTY: # CMAKE_EGL_LIBDIR = "$$cmakeTargetPath($$QMAKE_LIBDIR_EGL)" -#### Keys ignored in scope 14:.:.:gui.pro:QT_FEATURE_opengles2: +#### Keys ignored in scope 10:.:.:gui.pro:QT_FEATURE_opengles2: # CMAKE_GL_HEADER_NAME = "GLES2/gl2.h" # CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL_ES2)" # CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL_ES2)" # CMAKE_QT_OPENGL_IMPLEMENTATION = "GLESv2" -#### Keys ignored in scope 15:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ES2_ISEMPTY: +#### Keys ignored in scope 11:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ES2_ISEMPTY: # CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL_ES2)" -#### Keys ignored in scope 16:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ES2_ISEMPTY: +#### Keys ignored in scope 12:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ES2_ISEMPTY: # CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL_ES2)" -#### Keys ignored in scope 18:.:.:gui.pro:QT_FEATURE_opengl: +#### Keys ignored in scope 14:.:.:gui.pro:QT_FEATURE_opengl: # CMAKE_GL_HEADER_NAME = "GL/gl.h" # CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL)" # CMAKE_QT_OPENGL_IMPLEMENTATION = "GL" -#### Keys ignored in scope 19:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ISEMPTY: +#### Keys ignored in scope 15:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ISEMPTY: # CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL)" -#### Keys ignored in scope 20:.:.:gui.pro:NOT QT_FEATURE_dynamicgl: +#### Keys ignored in scope 16:.:.:gui.pro:NOT QT_FEATURE_dynamicgl: # CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL)" -#### Keys ignored in scope 21:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ISEMPTY: +#### Keys ignored in scope 17:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ISEMPTY: # CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL)" -#### Keys ignored in scope 22:.:.:gui.pro:APPLE: +#### Keys ignored in scope 18:.:.:gui.pro:APPLE: # CMAKE_GL_HEADER_NAME = "gl.h" -#### Keys ignored in scope 23:.:.:gui.pro:QT_FEATURE_egl: -# CMAKE_EGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_EGL)" - qt_extend_target(Gui CONDITION QT_FEATURE_accessibility SOURCES accessible/qaccessible.cpp accessible/qaccessible.h @@ -402,10 +393,10 @@ qt_extend_target(Gui CONDITION QT_FEATURE_png WrapPNG::WrapPNG ) -#### Keys ignored in scope 39:.:image:image/image.pri:WIN32 AND mingw: +#### Keys ignored in scope 35:.: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) +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 ) @@ -582,7 +573,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan Vulkan::Vulkan_nolink ) -#### Keys ignored in scope 83:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen: +#### Keys ignored in scope 79:.: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" @@ -598,10 +589,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 84:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: +#### Keys ignored in scope 80:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: # qvkgen_h.variable_out = "HEADERS" -#### Keys ignored in scope 85:.:vulkan:vulkan/vulkan.pri:else: +#### Keys ignored in scope 81:.:vulkan:vulkan/vulkan.pri:else: # qvkgen_h.CONFIG = "target_predeps" "no_link" qt_extend_target(Gui CONDITION WASM |