Post Merge Fixes

Change-Id: I1e06c01b76b119c3f23b6e6ecbaae8df719b70ce
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

configure.cmake

@@ -387,6 +387,12 @@ qt_feature("testcocoon"
     AUTODETECT OFF
 )
 qt_feature_config("testcocoon" QMAKE_PUBLIC_CONFIG)
+qt_feature("sanitize_fuzzer_no_link"
+    LABEL "Fuzzer (instrumentation only)"
+    PURPOSE "Adds instrumentation for fuzzing to the binaries but links to the usual main function instead of a fuzzer's."
+    AUTODETECT OFF
+)
+qt_feature_config("sanitize_fuzzer_no_link" QMAKE_PUBLIC_CONFIG)
 qt_feature("coverage_trace_pc_guard"
     LABEL "trace-pc-guard"
     AUTODETECT OFF

configure.json

@@ -898,7 +898,7 @@
             "label": "Fuzzer (instrumentation only)",
             "autoDetect": false,
             "output": [ "publicConfig" ],
-            "purpose": [ "Adds instrumentation for fuzzing to the binaries but links to the usual main function instead of a fuzzer's." ]
+            "purpose": "Adds instrumentation for fuzzing to the binaries but links to the usual main function instead of a fuzzer's."
         },
         "sanitize_undefined": {
             "label": "Undefined",

examples/opengl/2dpainting/CMakeLists.txt

@@ -9,11 +9,12 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/2dpainting")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS OpenGL)
 
 add_qt_gui_executable(2dpainting
     glwidget.cpp glwidget.h
@@ -25,6 +26,7 @@ add_qt_gui_executable(2dpainting
 target_link_libraries(2dpainting PUBLIC
     Qt::Core
     Qt::Gui
+    Qt::OpenGL
     Qt::Widgets
 )
 

examples/opengl/computegles31/CMakeLists.txt

@@ -9,10 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/computegles31")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS OpenGL)
 
 add_qt_gui_executable(computegles31
     glwindow.cpp glwindow.h
@@ -21,8 +22,10 @@ add_qt_gui_executable(computegles31
 target_link_libraries(computegles31 PUBLIC
     Qt::Core
     Qt::Gui
+    Qt::OpenGL
 )
 
+
 # Resources:
 set(computegles31_resource_files
     "Qt-logo-medium.png"
@@ -35,7 +38,6 @@ qt6_add_resources(computegles31 "computegles31"
         ${computegles31_resource_files}
 )
 
-
 install(TARGETS computegles31
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

examples/opengl/contextinfo/CMakeLists.txt

@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/contextinfo")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)

examples/opengl/cube/CMakeLists.txt

@@ -9,11 +9,12 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/cube")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS OpenGL)
 
 add_qt_gui_executable(cube
     geometryengine.cpp geometryengine.h
@@ -23,9 +24,11 @@ add_qt_gui_executable(cube
 target_link_libraries(cube PUBLIC
     Qt::Core
     Qt::Gui
+    Qt::OpenGL
     Qt::Widgets
 )
 
+
 # Resources:
 set(shaders_resource_files
     "fshader.glsl"
@@ -49,7 +52,6 @@ qt6_add_resources(cube "textures"
         ${textures_resource_files}
 )
 
-
 install(TARGETS cube
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

examples/opengl/hellogl2/CMakeLists.txt

@@ -9,11 +9,12 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/hellogl2")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS OpenGL)
 
 add_qt_gui_executable(hellogl2
     glwidget.cpp glwidget.h
@@ -25,6 +26,7 @@ add_qt_gui_executable(hellogl2
 target_link_libraries(hellogl2 PUBLIC
     Qt::Core
     Qt::Gui
+    Qt::OpenGL
     Qt::Widgets
 )
 

examples/opengl/hellogles3/CMakeLists.txt

@@ -9,10 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/hellogles3")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS OpenGL)
 
 add_qt_gui_executable(hellogles3
     ../hellogl2/logo.cpp ../hellogl2/logo.h
@@ -22,8 +23,10 @@ add_qt_gui_executable(hellogles3
 target_link_libraries(hellogles3 PUBLIC
     Qt::Core
     Qt::Gui
+    Qt::OpenGL
 )
 
+
 # Resources:
 set(hellogles3_resource_files
     "qtlogo.png"
@@ -36,7 +39,6 @@ qt6_add_resources(hellogles3 "hellogles3"
         ${hellogles3_resource_files}
 )
 
-
 install(TARGETS hellogles3
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

examples/opengl/hellowindow/CMakeLists.txt

@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/hellowindow")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -22,6 +22,7 @@ target_link_libraries(hellowindow PRIVATE
     Qt::CorePrivate
     Qt::GuiPrivate
 )
+
 target_link_libraries(hellowindow PUBLIC
     Qt::Core
     Qt::Gui

examples/opengl/legacy/framebufferobject2/CMakeLists.txt

@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/legacy/framebufferobject2")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -27,6 +27,7 @@ target_link_libraries(framebufferobject2 PUBLIC
     Qt::Widgets
 )
 
+
 # Resources:
 set(framebufferobject2_resource_files
     "cubelogo.png"
@@ -39,7 +40,6 @@ qt6_add_resources(framebufferobject2 "framebufferobject2"
         ${framebufferobject2_resource_files}
 )
 
-
 install(TARGETS framebufferobject2
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

examples/opengl/legacy/grabber/CMakeLists.txt

@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/legacy/grabber")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)

examples/opengl/legacy/hellogl/CMakeLists.txt

@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/legacy/hellogl")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -25,6 +25,7 @@ add_qt_gui_executable(hellogl
 target_include_directories(hellogl PUBLIC
     ../shared
 )
+
 target_link_libraries(hellogl PUBLIC
     Qt::Core
     Qt::Gui

examples/opengl/legacy/overpainting/CMakeLists.txt

@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/legacy/overpainting")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -25,6 +25,7 @@ add_qt_gui_executable(overpainting
 target_include_directories(overpainting PUBLIC
     ../shared
 )
+
 target_link_libraries(overpainting PUBLIC
     Qt::Core
     Qt::Gui

examples/opengl/legacy/pbuffers/CMakeLists.txt

@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/legacy/pbuffers")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -28,6 +28,7 @@ target_link_libraries(pbuffers PUBLIC
     Qt::Widgets
 )
 
+
 # Resources:
 set(pbuffers_resource_files
     "cubelogo.png"
@@ -40,7 +41,6 @@ qt6_add_resources(pbuffers "pbuffers"
         ${pbuffers_resource_files}
 )
 
-
 install(TARGETS pbuffers
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

examples/opengl/legacy/pbuffers2/CMakeLists.txt

@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/legacy/pbuffers2")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -29,6 +29,7 @@ target_link_libraries(pbuffers2 PUBLIC
     Qt::Widgets
 )
 
+
 # Resources:
 set(pbuffers2_resource_files
     "bubbles.svg"
@@ -42,7 +43,6 @@ qt6_add_resources(pbuffers2 "pbuffers2"
         ${pbuffers2_resource_files}
 )
 
-
 install(TARGETS pbuffers2
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

examples/opengl/legacy/samplebuffers/CMakeLists.txt

@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/legacy/samplebuffers")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)

examples/opengl/paintedwindow/CMakeLists.txt

@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/paintedwindow")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)

examples/opengl/qopenglwidget/CMakeLists.txt

@@ -9,11 +9,12 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/qopenglwidget")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS OpenGL)
 
 add_qt_gui_executable(qopenglwidget
     bubble.cpp bubble.h
@@ -24,9 +25,11 @@ add_qt_gui_executable(qopenglwidget
 target_link_libraries(qopenglwidget PUBLIC
     Qt::Core
     Qt::Gui
+    Qt::OpenGL
     Qt::Widgets
 )
 
+
 # Resources:
 set(texture_resource_files
     "qt.png"
@@ -39,7 +42,6 @@ qt6_add_resources(qopenglwidget "texture"
         ${texture_resource_files}
 )
 
-
 install(TARGETS qopenglwidget
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

examples/opengl/qopenglwindow/CMakeLists.txt

@@ -9,10 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/qopenglwindow")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS OpenGL)
 
 add_qt_gui_executable(qopenglwindow
     background_renderer.cpp background_renderer.h
@@ -21,11 +22,14 @@ add_qt_gui_executable(qopenglwindow
 target_include_directories(qopenglwindow PUBLIC
     .
 )
+
 target_link_libraries(qopenglwindow PUBLIC
     Qt::Core
     Qt::Gui
+    Qt::OpenGL
 )
 
+
 # Resources:
 set(shaders_resource_files
     "background.frag"
@@ -38,7 +42,6 @@ qt6_add_resources(qopenglwindow "shaders"
         ${shaders_resource_files}
 )
 
-
 install(TARGETS qopenglwindow
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

examples/opengl/textures/CMakeLists.txt

@@ -9,11 +9,12 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/textures")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS OpenGL)
 
 add_qt_gui_executable(textures
     glwidget.cpp glwidget.h
@@ -23,9 +24,11 @@ add_qt_gui_executable(textures
 target_link_libraries(textures PUBLIC
     Qt::Core
     Qt::Gui
+    Qt::OpenGL
     Qt::Widgets
 )
 
+
 # Resources:
 set(textures_resource_files
     "images/side1.png"
@@ -43,7 +46,6 @@ qt6_add_resources(textures "textures"
         ${textures_resource_files}
 )
 
-
 install(TARGETS textures
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

examples/opengl/threadedqopenglwidget/CMakeLists.txt

@@ -9,11 +9,12 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/opengl/threadedqopenglwidget")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS OpenGL)
 
 add_qt_gui_executable(threadedqopenglwidget
     glwidget.cpp glwidget.h
@@ -23,6 +24,7 @@ add_qt_gui_executable(threadedqopenglwidget
 target_link_libraries(threadedqopenglwidget PUBLIC
     Qt::Core
     Qt::Gui
+    Qt::OpenGL
     Qt::Widgets
 )
 

examples/widgets/graphicsview/CMakeLists.txt

@@ -14,7 +14,3 @@ add_subdirectory(flowlayout)
 add_subdirectory(anchorlayout)
 add_subdirectory(simpleanchorlayout)
 add_subdirectory(weatheranchorlayout)
-
-if(TARGET Qt::OpenGL AND NOT QT_FEATURE_opengles2 AND NOT QT_FEATURE_dynamicgl)
-   add_subdirectory(boxes)
-endif()

examples/widgets/graphicsview/boxes/CMakeLists.txt

@@ -1,39 +0,0 @@
-# Generated from boxes.pro.
-
-cmake_minimum_required(VERSION 3.14)
-project(boxes LANGUAGES CXX)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
-
-set(INSTALL_EXAMPLEDIR "examples")
-
-find_package(Qt6 COMPONENTS OpenGL)
-find_package(Qt6 COMPONENTS Widgets)
-
-
-add_qt_gui_executable(boxes
-    3rdparty/fbm.c 3rdparty/fbm.h
-    boxes.qrc
-    glbuffers.cpp glbuffers.h
-    glextensions.cpp glextensions.h
-    gltrianglemesh.h
-    main.cpp
-    qtbox.cpp qtbox.h
-    roundedbox.cpp roundedbox.h
-    scene.cpp scene.h
-    trackball.cpp trackball.h
-)
-target_link_libraries(boxes PUBLIC
-    Qt::OpenGL
-    Qt::Widgets
-)
-
-install(TARGETS boxes
-    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
-    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
-    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
-)

examples/widgets/painting/pathstroke/CMakeLists.txt

@@ -9,25 +9,204 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/painting/pathstroke")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(pathstroke
     ../shared/arthurstyle.cpp ../shared/arthurstyle.h
     ../shared/arthurwidgets.cpp ../shared/arthurwidgets.h
     ../shared/hoverpoints.cpp ../shared/hoverpoints.h
-    ../shared/shared.qrc
     main.cpp
-    pathstroke.cpp pathstroke.h pathstroke.qrc
+    pathstroke.cpp pathstroke.h
 )
 target_include_directories(pathstroke PUBLIC
     ../shared
 )
+
 target_link_libraries(pathstroke PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
+
+# Resources:
+set_source_files_properties("../shared/images/button_normal_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_normal_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_normal_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_pressed_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
+)
+set_source_files_properties("../shared/images/frame_bottom.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
+)
+set_source_files_properties("../shared/images/frame_bottomleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
+)
+set_source_files_properties("../shared/images/frame_bottomright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
+)
+set_source_files_properties("../shared/images/frame_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
+)
+set_source_files_properties("../shared/images/frame_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
+)
+set_source_files_properties("../shared/images/frame_top.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
+)
+set_source_files_properties("../shared/images/frame_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
+)
+set_source_files_properties("../shared/images/frame_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_left_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_right_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_top_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
+)
+set_source_files_properties("../shared/images/groupframe_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
+)
+set_source_files_properties("../shared/images/line_dashed.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
+)
+set_source_files_properties("../shared/images/line_dotted.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
+)
+set_source_files_properties("../shared/images/line_solid.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
+)
+set_source_files_properties("../shared/images/radiobutton-on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
+)
+set_source_files_properties("../shared/images/radiobutton_off.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
+)
+set_source_files_properties("../shared/images/radiobutton_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
+)
+set_source_files_properties("../shared/images/slider_bar.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
+)
+set_source_files_properties("../shared/images/slider_thumb_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
+)
+set_source_files_properties("../shared/images/title_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
+)
+set_source_files_properties("../shared/images/title_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
+)
+set_source_files_properties("../shared/images/title_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
+)
+set(shared_resource_files
+    "images/button_normal_cap_left.png"
+    "images/button_normal_cap_right.png"
+    "images/button_normal_stretch.png"
+    "images/button_pressed_cap_left.png"
+    "images/button_pressed_cap_right.png"
+    "images/button_pressed_stretch.png"
+    "images/frame_bottom.png"
+    "images/frame_bottomleft.png"
+    "images/frame_bottomright.png"
+    "images/frame_left.png"
+    "images/frame_right.png"
+    "images/frame_top.png"
+    "images/frame_topleft.png"
+    "images/frame_topright.png"
+    "images/groupframe_bottom_left.png"
+    "images/groupframe_bottom_right.png"
+    "images/groupframe_bottom_stretch.png"
+    "images/groupframe_left_stretch.png"
+    "images/groupframe_right_stretch.png"
+    "images/groupframe_top_stretch.png"
+    "images/groupframe_topleft.png"
+    "images/groupframe_topright.png"
+    "images/line_dash_dot.png"
+    "images/line_dash_dot_dot.png"
+    "images/line_dashed.png"
+    "images/line_dotted.png"
+    "images/line_solid.png"
+    "images/radiobutton-on.png"
+    "images/radiobutton_off.png"
+    "images/radiobutton_on.png"
+    "images/slider_bar.png"
+    "images/slider_thumb_on.png"
+    "images/title_cap_left.png"
+    "images/title_cap_right.png"
+    "images/title_stretch.png"
+)
+
+qt6_add_resources(pathstroke "shared"
+    PREFIX
+        "/res"
+    BASE
+        "../shared"
+    FILES
+        ${shared_resource_files}
+)
+set(pathstroke_resource_files
+    "pathstroke.cpp"
+    "pathstroke.html"
+)
+
+qt6_add_resources(pathstroke "pathstroke"
+    PREFIX
+        "/res/pathstroke"
+    FILES
+        ${pathstroke_resource_files}
+)
+
+if(QT_FEATURE_opengl)
+    target_sources(pathstroke PUBLIC
+        ../shared/fbopaintdevice.cpp ../shared/fbopaintdevice.h
+    )
+
+    target_link_libraries(pathstroke PUBLIC
+        Qt::OpenGL
+    )
+endif()
+
 install(TARGETS pathstroke
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

examples/xml/CMakeLists.txt

@@ -5,7 +5,6 @@ add_subdirectory(xmlstreamlint)
 
 if(TARGET Qt::Widgets)
     add_subdirectory(dombookmarks)
-    add_subdirectory(saxbookmarks)
     add_subdirectory(streambookmarks)
 
     if(TARGET Qt::Network)

qmake/.prev_CMakeLists.txt

@@ -30,6 +30,7 @@ qt_add_executable(qmake
         ../src/corelib/kernel/qsystemerror.cpp ../src/corelib/kernel/qsystemerror_p.h
         ../src/corelib/kernel/qvariant.cpp
         ../src/corelib/plugin/quuid.cpp ../src/corelib/plugin/quuid.h
+        ../src/corelib/serialization/qcborstreamwriter.cpp ../src/corelib/serialization/qcborstreamwriter.h
         ../src/corelib/serialization/qcborvalue.cpp ../src/corelib/serialization/qcborvalue.h ../src/corelib/serialization/qcborvalue_p.h
         ../src/corelib/serialization/qjson_p.h
         ../src/corelib/serialization/qjsonarray.cpp ../src/corelib/serialization/qjsonarray.h
@@ -112,6 +113,7 @@ qt_add_executable(qmake
         (..)/include/QtCore//QtCore
         (..)/src/corelib/global
         .
+        ../src/3rdparty/tinycbor/src
         generators
         generators/mac
         generators/unix

qmake/CMakeLists.txt

@@ -37,6 +37,7 @@ qt_add_tool(qmake # special case
         ../src/corelib/kernel/qsystemerror.cpp ../src/corelib/kernel/qsystemerror_p.h
         ../src/corelib/kernel/qvariant.cpp
         ../src/corelib/plugin/quuid.cpp ../src/corelib/plugin/quuid.h
+        ../src/corelib/serialization/qcborstreamwriter.cpp ../src/corelib/serialization/qcborstreamwriter.h
         ../src/corelib/serialization/qcborvalue.cpp ../src/corelib/serialization/qcborvalue.h ../src/corelib/serialization/qcborvalue_p.h
         ../src/corelib/serialization/qjson_p.h
         ../src/corelib/serialization/qjsonarray.cpp ../src/corelib/serialization/qjsonarray.h

src/corelib/.prev_CMakeLists.txt

@@ -119,9 +119,10 @@ qt_add_module(Core
         plugin/qpluginloader.cpp plugin/qpluginloader.h
         plugin/quuid.cpp plugin/quuid.h
         serialization/qcborarray.h
-        serialization/qcborcommon.h
+        serialization/qcborcommon.cpp serialization/qcborcommon.h serialization/qcborcommon_p.h
         serialization/qcbordiagnostic.cpp
         serialization/qcbormap.h
+        serialization/qcborstream.h
         serialization/qcborvalue.cpp serialization/qcborvalue.h serialization/qcborvalue_p.h
         serialization/qdatastream.cpp serialization/qdatastream.h serialization/qdatastream_p.h
         serialization/qjson_p.h
@@ -193,6 +194,7 @@ qt_add_module(Core
         tools/qcontainertools_impl.h
         tools/qcontiguouscache.cpp tools/qcontiguouscache.h
         tools/qcryptographichash.cpp tools/qcryptographichash.h
+        tools/qflatmap_p.h
         tools/qfreelist.cpp tools/qfreelist_p.h
         tools/qhash.cpp tools/qhash.h
         tools/qhashfunctions.h
@@ -780,6 +782,11 @@ qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL
         io/qsettings_mac.cpp
 )
 
+qt_extend_target(Core CONDITION QT_FEATURE_settings AND WASM
+    SOURCES
+        io/qsettings_wasm.cpp
+)
+
 qt_extend_target(Core CONDITION QT_FEATURE_filesystemiterator AND WIN32
     SOURCES
         io/qfilesystemiterator_win.cpp
@@ -995,9 +1002,14 @@ qt_extend_target(Core CONDITION QT_FEATURE_textcodec AND WIN32 AND NOT QT_FEATUR
         codecs/qwindowscodec.cpp codecs/qwindowscodec_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_cborstream
+qt_extend_target(Core CONDITION QT_FEATURE_cborstreamreader
     SOURCES
-        serialization/qcborstream.cpp serialization/qcborstream.h
+        serialization/qcborstreamreader.cpp serialization/qcborstreamreader.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_cborstreamwriter
+    SOURCES
+        serialization/qcborstreamwriter.cpp serialization/qcborstreamwriter.h
 )
 
 qt_extend_target(Core CONDITION QT_FEATURE_binaryjson
@@ -1024,24 +1036,38 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype
         mimetypes/qmimetypeparser.cpp mimetypes/qmimetypeparser_p.h
 )
 
-if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database)
+#### Keys ignored in scope 197:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype:
-    # Resources:
+# MIME_DATABASE = "mimetypes/mime/packages/freedesktop.org.xml"
-    set_source_files_properties("mimetypes/mime/packages/freedesktop.org.xml"
+# OTHER_FILES = "$$MIME_DATABASE"
-        PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
-    )
-    set(mimetypes_resource_files
-        "mime/packages/freedesktop.org.xml"
-    )
 
-    qt_add_resource(Core "mimetypes"
+qt_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database
-        PREFIX
+    INCLUDE_DIRECTORIES
-            "/qt-project.org/qmime/packages"
+        .rcc
-        BASE
+)
-            "mimetypes"
+
-        FILES
+#### Keys ignored in scope 198:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype_database:
-            ${mimetypes_resource_files}
+# QMAKE_EXTRA_COMPILERS = "mimedb"
-    )
+# mimedb.commands = "${QMAKE_FILE_IN}" ">" "${QMAKE_FILE_OUT}"
-endif()
+# mimedb.depends = "$$PWD/mime/generate.pl"
+# mimedb.input = "MIME_DATABASE"
+# mimedb.output = "$$outpath/qmimeprovider_database.cpp"
+# mimedb.variable_out = "INCLUDED_SOURCES"
+
+#### Keys ignored in scope 200:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# outpath = ".rcc/debug"
+
+#### Keys ignored in scope 201:.:mimetypes:mimetypes/mimetypes.pri:else:
+# outpath = ".rcc/release"
+
+#### Keys ignored in scope 202:.:mimetypes:mimetypes/mimetypes.pri:MAKEFILE_GENERATOR___equals___MSVC.NET OR MAKEFILE_GENERATOR___equals___MSBUILD OR QMAKE_SH_ISEMPTY:
+# mimedb.commands = "cmd" "/c" "$$shell_path($$PWD/mime/generate.bat)"
+# mimedb.depends = "$$PWD/mime/generate.bat" "$$PWD/mime/hexdump.ps1"
+
+#### Keys ignored in scope 203:.:mimetypes:mimetypes/mimetypes.pri:else:
+# mimedb.commands = "perl" "$${mimedb.depends}"
+
+#### Keys ignored in scope 204:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd:
+# mimedb.commands = "--zstd"
 
 qt_extend_target(Core CONDITION WASM
     SOURCES

src/corelib/CMakeLists.txt

@@ -133,9 +133,10 @@ qt_add_module(Core
         plugin/qpluginloader.cpp plugin/qpluginloader.h
         plugin/quuid.cpp plugin/quuid.h
         serialization/qcborarray.h
-        serialization/qcborcommon.h
+        serialization/qcborcommon.cpp serialization/qcborcommon.h serialization/qcborcommon_p.h
         serialization/qcbordiagnostic.cpp
         serialization/qcbormap.h
+        serialization/qcborstream.h
         serialization/qcborvalue.cpp serialization/qcborvalue.h serialization/qcborvalue_p.h
         serialization/qdatastream.cpp serialization/qdatastream.h serialization/qdatastream_p.h
         serialization/qjson_p.h
@@ -207,6 +208,7 @@ qt_add_module(Core
         tools/qcontainertools_impl.h
         tools/qcontiguouscache.cpp tools/qcontiguouscache.h
         tools/qcryptographichash.cpp tools/qcryptographichash.h
+        tools/qflatmap_p.h
         tools/qfreelist.cpp tools/qfreelist_p.h
         tools/qhash.cpp tools/qhash.h
         tools/qhashfunctions.h
@@ -856,6 +858,11 @@ qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL
         io/qsettings_mac.cpp
 )
 
+qt_extend_target(Core CONDITION QT_FEATURE_settings AND WASM
+    SOURCES
+        io/qsettings_wasm.cpp
+)
+
 qt_extend_target(Core CONDITION QT_FEATURE_filesystemiterator AND WIN32
     SOURCES
         io/qfilesystemiterator_win.cpp
@@ -1071,9 +1078,14 @@ qt_extend_target(Core CONDITION QT_FEATURE_textcodec AND WIN32 AND NOT QT_FEATUR
         codecs/qwindowscodec.cpp codecs/qwindowscodec_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_cborstream
+qt_extend_target(Core CONDITION QT_FEATURE_cborstreamreader
     SOURCES
-        serialization/qcborstream.cpp serialization/qcborstream.h
+        serialization/qcborstreamreader.cpp serialization/qcborstreamreader.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_cborstreamwriter
+    SOURCES
+        serialization/qcborstreamwriter.cpp serialization/qcborstreamwriter.h
 )
 
 qt_extend_target(Core CONDITION QT_FEATURE_binaryjson
@@ -1100,6 +1112,40 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype
         mimetypes/qmimetypeparser.cpp mimetypes/qmimetypeparser_p.h
 )
 
+#### Keys ignored in scope 197:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype:
+# MIME_DATABASE = "mimetypes/mime/packages/freedesktop.org.xml"
+# OTHER_FILES = "$$MIME_DATABASE"
+
+# special case begin
+# qt_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database
+#        INCLUDE_DIRECTORIES
+#        .rcc
+#)
+# special case end
+
+#### Keys ignored in scope 198:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype_database:
+# QMAKE_EXTRA_COMPILERS = "mimedb"
+# mimedb.commands = "${QMAKE_FILE_IN}" ">" "${QMAKE_FILE_OUT}"
+# mimedb.depends = "$$PWD/mime/generate.pl"
+# mimedb.input = "MIME_DATABASE"
+# mimedb.output = "$$outpath/qmimeprovider_database.cpp"
+# mimedb.variable_out = "INCLUDED_SOURCES"
+
+#### Keys ignored in scope 200:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# outpath = ".rcc/debug"
+
+#### Keys ignored in scope 201:.:mimetypes:mimetypes/mimetypes.pri:else:
+# outpath = ".rcc/release"
+
+#### Keys ignored in scope 202:.:mimetypes:mimetypes/mimetypes.pri:MAKEFILE_GENERATOR___equals___MSVC.NET OR MAKEFILE_GENERATOR___equals___MSBUILD OR QMAKE_SH_ISEMPTY:
+# mimedb.commands = "cmd" "/c" "$$shell_path($$PWD/mime/generate.bat)"
+# mimedb.depends = "$$PWD/mime/generate.bat" "$$PWD/mime/hexdump.ps1"
+
+#### Keys ignored in scope 203:.:mimetypes:mimetypes/mimetypes.pri:else:
+# mimedb.commands = "perl" "$${mimedb.depends}"
+
+#### Keys ignored in scope 204:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd:
+# mimedb.commands = "--zstd"
 # Resources:
 # special case begin
 # We can't specify the resources directly as we have unit tests that
@@ -1108,7 +1154,36 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype
 if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database)
     include(${CMAKE_CURRENT_SOURCE_DIR}/mimetypes/mimetypes_resources.cmake)
     corelib_add_mimetypes_resources(Core)
+
+# Generate qmimeprovider_database.cpp
+    set(qmimeprovider_db_output "${CMAKE_CURRENT_BINARY_DIR}/.rcc/qmimeprovider_database.cpp")
+    set(command_args "")
+    set(mime_dir "${CMAKE_CURRENT_SOURCE_DIR}/mimetypes/mime")
+    set(command_depends "${mime_dir}/generate.pl" "${corelib_mimetypes_resource_file}")
+    if (MSVC)
+        list(APPEND command_args "${mime_dir}/generate.bat" "${mime_dir}/hexdump.ps1" )
+        list(APPEND command_depends "${mime_dir}/generate.bat" "${mime_dir}/hexdump.ps1" )
+    else()
+        list(APPEND command_args perl "${mime_dir}/generate.pl" )
+    endif()
+
+    if (QT_FEATURE_zstd)
+        list(APPEND command_args "--zstd")
+    endif()
+
+    list(APPEND command_args "${corelib_mimetypes_resource_file}" ">" "${qmimeprovider_db_output}")
+
+    add_custom_command(OUTPUT "${qmimeprovider_db_output}"
+         DEPENDS ${command_depends}
+         COMMAND ${command_args}
+         COMMENT "Generating ${qmimeprovider_db_output}"
+    )
+
+    target_sources(Core PRIVATE ${qmimeprovider_db_output})
+    set_source_files_properties(${qmimeprovider_db_output} PROPERTIES HEADER_FILE_ONLY TRUE)
+    target_include_directories(Core PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/.rcc")
 endif()
+
 # special case end
 
 qt_extend_target(Core CONDITION WASM

src/corelib/configure.cmake

@@ -942,10 +942,15 @@ qt_feature("win32_system_libs"
     LABEL "Windows System Libraries"
     CONDITION WIN32 AND libs.advapi32 AND libs.gdi32 AND libs.kernel32 AND libs.netapi32 AND libs.ole32 AND libs.shell32 AND libs.uuid AND libs.user32 AND libs.winmm AND libs.ws2_32 OR FIXME
 )
-qt_feature("cborstream" PUBLIC
+qt_feature("cborstreamreader" PUBLIC
     SECTION "Utilities"
-    LABEL "CBOR stream I/O"
+    LABEL "CBOR stream reading"
-    PURPOSE "Provides support for reading and writing the CBOR binary format.  Note that this is required for plugin loading. Qt GUI needs QPA plugins for basic operation."
+    PURPOSE "Provides support for reading the CBOR binary format.  Note that this is required for plugin loading. Qt GUI needs QPA plugins for basic operation."
+)
+qt_feature("cborstreamwriter" PUBLIC
+    SECTION "Utilities"
+    LABEL "CBOR stream writing"
+    PURPOSE "Provides support for writing the CBOR binary format."
 )
 qt_feature("binaryjson" PUBLIC
     SECTION "Utilities"

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

src/gui/CMakeLists.txt

@@ -286,18 +286,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/" # 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
@@ -345,13 +333,11 @@ endif()
 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
@@ -385,14 +371,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
@@ -516,6 +498,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
@@ -696,8 +686,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
@@ -725,6 +713,7 @@ qt_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.
@@ -780,10 +769,10 @@ add_custom_command(
 # 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
@@ -791,6 +780,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

src/gui/configure.cmake

@@ -687,7 +687,7 @@ qt_feature_definition("opengles2" "QT_OPENGL_ES_2")
 qt_feature_config("opengles2" QMAKE_PUBLIC_QT_CONFIG)
 qt_feature("opengles3" PUBLIC
     LABEL "OpenGL ES 3.0"
-    CONDITION QT_FEATURE_opengles2 AND NOT QT_FEATURE_angle AND TEST_opengles3 AND NOT WASM
+    CONDITION QT_FEATURE_opengles2 AND NOT QT_FEATURE_angle AND TEST_opengles3
 )
 qt_feature_definition("opengles3" "QT_OPENGL_ES_3")
 qt_feature("opengles31" PUBLIC
@@ -737,7 +737,7 @@ qt_feature("openvg" PUBLIC
 )
 qt_feature("egl" PUBLIC PRIVATE
     LABEL "EGL"
-    CONDITION ( QT_FEATURE_opengl OR QT_FEATURE_openvg ) AND ( QT_FEATURE_angle OR EGL_FOUND ) AND ( QT_FEATURE_dlopen OR NOT UNIX )
+    CONDITION ( QT_FEATURE_opengl OR QT_FEATURE_openvg ) AND ( QT_FEATURE_angle OR EGL_FOUND ) AND ( QT_FEATURE_dlopen OR NOT UNIX OR INTEGRITY )
 )
 qt_feature_definition("egl" "QT_NO_EGL" NEGATE VALUE "1")
 qt_feature("egl_x11" PRIVATE

src/network/.prev_CMakeLists.txt

@@ -402,7 +402,13 @@ qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE
         ssl/qsslsocket_openssl_android.cpp
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl
+qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND build_pass
+    LIBRARIES
+        crypto_${CMAKE_SYSTEM_PROCESSOR}
+        ssl_${CMAKE_SYSTEM_PROCESSOR}
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID
     LIBRARIES
         OpenSSL::SSL
 )

src/network/CMakeLists.txt

@@ -5,14 +5,12 @@
 # proper implementation of additional compile tests for library dependencies
 # in configure.json
 
-if (UNIX OR ANDROID)
 find_package(OpenSSL)
 if (NOT OPENSSL_FOUND OR NOT OPENSSL_VERSION VERSION_GREATER_EQUAL "1.1.0")
     set(QT_FEATURE_openssl_runtime OFF CACHE BOOL "" FORCE)
     set(QT_FEATURE_openssl_linked OFF CACHE BOOL "" FORCE)
     set(QT_FEATURE_openssl OFF CACHE BOOL "" FORCE)
 endif()
-endif()
 # special case end
 
 #####################################################################
@@ -417,7 +415,13 @@ qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE
         ssl/qsslsocket_openssl_android.cpp
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl
+qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND build_pass
+    LIBRARIES
+        crypto_${CMAKE_SYSTEM_PROCESSOR}
+        ssl_${CMAKE_SYSTEM_PROCESSOR}
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID
     LIBRARIES
         OpenSSL::SSL
 )

src/opengl/CMakeLists.txt

@@ -6,22 +6,8 @@
 
 qt_add_module(OpenGL
     SOURCES
-        gl2paintengineex/qgl2pexvertexarray.cpp gl2paintengineex/qgl2pexvertexarray_p.h
+        qopengldebug.cpp qopengldebug.h
-        gl2paintengineex/qglcustomshaderstage.cpp gl2paintengineex/qglcustomshaderstage_p.h
+        qopenglwindow.cpp qopenglwindow.h
-        gl2paintengineex/qglengineshadermanager.cpp gl2paintengineex/qglengineshadermanager_p.h
-        gl2paintengineex/qglengineshadersource_p.h
-        gl2paintengineex/qglgradientcache.cpp gl2paintengineex/qglgradientcache_p.h
-        gl2paintengineex/qglshadercache_p.h
-        gl2paintengineex/qpaintengineex_opengl2.cpp gl2paintengineex/qpaintengineex_opengl2_p.h
-        gl2paintengineex/qtextureglyphcache_gl.cpp gl2paintengineex/qtextureglyphcache_gl_p.h
-        qgl.cpp qgl.h qgl_p.h
-        qglbuffer.cpp qglbuffer.h
-        qglcolormap.cpp qglcolormap.h
-        qglframebufferobject.cpp qglframebufferobject.h qglframebufferobject_p.h
-        qglfunctions.cpp qglfunctions.h
-        qglpaintdevice.cpp qglpaintdevice_p.h
-        qglpixelbuffer.cpp qglpixelbuffer.h qglpixelbuffer_p.h
-        qglshaderprogram.cpp qglshaderprogram.h
         qtopenglglobal.h
     DEFINES
         QT_NO_FOREACH
@@ -29,27 +15,27 @@ qt_add_module(OpenGL
     LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-        Qt::WidgetsPrivate
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
-        Qt::Widgets
 )
 
 ## Scopes:
 #####################################################################
 
-qt_extend_target(OpenGL CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_extend_target(OpenGL CONDITION QT_FEATURE_widgets
-    LINK_OPTIONS
+    SOURCES
-        "/BASE:0x63000000"
+        qopenglwidget.cpp qopenglwidget.h
+    LIBRARIES
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Widgets
 )
 
-#### Keys ignored in scope 3:.:.:opengl.pro:solaris-cc_x_:
+qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
-# QMAKE_CXXFLAGS_RELEASE = "--O2"
-
-qt_extend_target(OpenGL CONDITION QT_FEATURE_graphicseffect
     SOURCES
-        qgraphicsshadereffect.cpp qgraphicsshadereffect_p.h
+        qopenglqueryhelper_p.h
+        qopengltimerquery.cpp qopengltimerquery.h
 )
 qt_add_docs(OpenGL
     doc/qtopengl.qdocconf

src/platformsupport/fontdatabases/.prev_CMakeLists.txt

@@ -59,7 +59,7 @@ qt_extend_target(FontDatabaseSupport CONDITION UNIX
         genericunix/qgenericunixfontdatabase_p.h
 )
 
-qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig AND UNIX
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig
     SOURCES
         fontconfig/qfontconfigdatabase.cpp fontconfig/qfontconfigdatabase_p.h
         fontconfig/qfontenginemultifontconfig.cpp fontconfig/qfontenginemultifontconfig_p.h

src/platformsupport/fontdatabases/CMakeLists.txt

@@ -62,7 +62,7 @@ qt_extend_target(FontDatabaseSupport CONDITION UNIX
         genericunix/qgenericunixfontdatabase_p.h
 )
 
-qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig AND UNIX
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig
     SOURCES
         fontconfig/qfontconfigdatabase.cpp fontconfig/qfontconfigdatabase_p.h
         fontconfig/qfontenginemultifontconfig.cpp fontconfig/qfontenginemultifontconfig_p.h

src/plugins/platforms/cocoa/.prev_CMakeLists.txt

@@ -31,7 +31,6 @@ qt_add_plugin(qcocoa
         qcocoansmenu.h qcocoansmenu.mm
         qcocoascreen.h qcocoascreen.mm
         qcocoaservices.h qcocoaservices.mm
-        qcocoasystemsettings.h qcocoasystemsettings.mm
         qcocoasystemtrayicon.h qcocoasystemtrayicon.mm
         qcocoatheme.h qcocoatheme.mm
         qcocoawindow.h qcocoawindow.mm
@@ -112,6 +111,11 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_accessibility
         Qt::AccessibilitySupport
 )
 
+qt_extend_target(qcocoa CONDITION QT_FEATURE_sessionmanager
+    SOURCES
+        qcocoasessionmanager.cpp qcocoasessionmanager.h
+)
+
 qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets
     SOURCES
         qpaintengine_mac.mm qpaintengine_mac_p.h
@@ -121,7 +125,7 @@ qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets
         Qt::Widgets
 )
 
-#### Keys ignored in scope 6:.:.:cocoa.pro:TARGET Qt::Widgets:
+#### Keys ignored in scope 7:.:.:cocoa.pro:TARGET Qt::Widgets:
 # QT_FOR_CONFIG = "widgets"
 
 qt_extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
@@ -150,5 +154,5 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets
         qcocoafontdialoghelper.h qcocoafontdialoghelper.mm
 )
 
-#### Keys ignored in scope 11:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 12:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"

src/plugins/platforms/cocoa/CMakeLists.txt

@@ -35,7 +35,6 @@ qt_add_plugin(qcocoa
         qcocoansmenu.h qcocoansmenu.mm
         qcocoascreen.h qcocoascreen.mm
         qcocoaservices.h qcocoaservices.mm
-        qcocoasystemsettings.h qcocoasystemsettings.mm
         qcocoasystemtrayicon.h qcocoasystemtrayicon.mm
         qcocoatheme.h qcocoatheme.mm
         qcocoawindow.h qcocoawindow.mm
@@ -116,6 +115,11 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_accessibility
         Qt::AccessibilitySupport
 )
 
+qt_extend_target(qcocoa CONDITION QT_FEATURE_sessionmanager
+    SOURCES
+        qcocoasessionmanager.cpp qcocoasessionmanager.h
+)
+
 qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets
     SOURCES
         qpaintengine_mac.mm qpaintengine_mac_p.h
@@ -125,7 +129,7 @@ qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets
         Qt::Widgets
 )
 
-#### Keys ignored in scope 6:.:.:cocoa.pro:TARGET Qt::Widgets:
+#### Keys ignored in scope 7:.:.:cocoa.pro:TARGET Qt::Widgets:
 # QT_FOR_CONFIG = "widgets"
 
 qt_extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
@@ -154,5 +158,5 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets
         qcocoafontdialoghelper.h qcocoafontdialoghelper.mm
 )
 
-#### Keys ignored in scope 11:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 12:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"

src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt

@@ -9,6 +9,7 @@ qt_add_module(EglFsKmsSupport
     NO_MODULE_HEADERS
     SOURCES
         qeglfskmsdevice.cpp qeglfskmsdevice.h
+        qeglfskmseventreader.cpp qeglfskmseventreader.h
         qeglfskmshelpers.h
         qeglfskmsintegration.cpp qeglfskmsintegration.h
         qeglfskmsscreen.cpp qeglfskmsscreen.h

src/plugins/styles/windowsvista/CMakeLists.txt

@@ -13,12 +13,11 @@ qt_add_plugin(qwindowsvistastyle
         qwindowsvistastyle_p_p.h
         qwindowsxpstyle.cpp qwindowsxpstyle_p.h
         qwindowsxpstyle_p_p.h
-    INCLUDE_DIRECTORIES
-        ../3rdparty/wintab
     LIBRARIES
         Qt::WidgetsPrivate
         gdi32
         user32
+        uxtheme
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
@@ -27,13 +26,3 @@ qt_add_plugin(qwindowsvistastyle
 
 #### Keys ignored in scope 1:.:.:windowsvista.pro:<TRUE>:
 # DISTFILES = "windowsvistastyle.json"
-
-## Scopes:
-#####################################################################
-
-qt_extend_target(qwindowsvistastyle CONDITION NOT WINRT
-    LIBRARIES
-        dwmapi
-        shell32
-        uxtheme
-)

src/tools/bootstrap/.prev_CMakeLists.txt

@@ -53,6 +53,8 @@ qt_add_module(Bootstrap
         ../../corelib/kernel/qsystemsemaphore.cpp
         ../../corelib/kernel/qvariant.cpp
         ../../corelib/plugin/quuid.cpp
+        ../../corelib/serialization/qcborcommon.cpp
+        ../../corelib/serialization/qcborstreamwriter.cpp
         ../../corelib/serialization/qcborvalue.cpp
         ../../corelib/serialization/qdatastream.cpp
         ../../corelib/serialization/qjsonarray.cpp
@@ -105,6 +107,9 @@ qt_add_module(Bootstrap
         QT_VERSION_MINOR=
         QT_VERSION_PATCH=
         QT_VERSION_STR=\"\"
+    INCLUDE_DIRECTORIES
+        ..
+        ../../3rdparty/tinycbor/src
 )
 
 #### Keys ignored in scope 1:.:.:bootstrap.pro:<TRUE>:

src/tools/bootstrap/CMakeLists.txt

@@ -51,6 +51,8 @@ qt_extend_target(Bootstrap
         ../../corelib/kernel/qsystemsemaphore.cpp
         ../../corelib/kernel/qvariant.cpp
         ../../corelib/plugin/quuid.cpp
+        ../../corelib/serialization/qcborcommon.cpp
+        ../../corelib/serialization/qcborstreamwriter.cpp
         ../../corelib/serialization/qcborvalue.cpp
         ../../corelib/serialization/qdatastream.cpp
         ../../corelib/serialization/qjsonarray.cpp
@@ -104,6 +106,9 @@ qt_extend_target(Bootstrap
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
         QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        ..
+        ../../3rdparty/tinycbor/src
     PUBLIC_INCLUDE_DIRECTORIES  # special case
         $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:Xml,INCLUDE_DIRECTORIES>

src/widgets/.prev_CMakeLists.txt

@@ -300,11 +300,6 @@ qt_extend_target(Widgets CONDITION APPLE_OSX
         z
 )
 
-qt_extend_target(Widgets CONDITION WIN32
-    INCLUDE_DIRECTORIES
-        ../3rdparty/wintab
-)
-
 qt_extend_target(Widgets CONDITION WIN32 AND NOT WINRT
     LIBRARIES
         dwmapi
@@ -325,11 +320,6 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_action
         kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_opengl
-    SOURCES
-        kernel/qopenglwidget.cpp kernel/qopenglwidget.h
-)
-
 qt_extend_target(Widgets CONDITION QT_FEATURE_formlayout
     SOURCES
         kernel/qformlayout.cpp kernel/qformlayout.h

src/widgets/CMakeLists.txt

@@ -302,11 +302,6 @@ qt_extend_target(Widgets CONDITION APPLE_OSX
         z
 )
 
-qt_extend_target(Widgets CONDITION WIN32
-    INCLUDE_DIRECTORIES
-        ../3rdparty/wintab
-)
-
 qt_extend_target(Widgets CONDITION WIN32 AND NOT WINRT
     LIBRARIES
         dwmapi
@@ -327,11 +322,6 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_action
         kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h
 )
 
-qt_extend_target(Widgets CONDITION QT_FEATURE_opengl
-    SOURCES
-        kernel/qopenglwidget.cpp kernel/qopenglwidget.h
-)
-
 qt_extend_target(Widgets CONDITION QT_FEATURE_formlayout
     SOURCES
         kernel/qformlayout.cpp kernel/qformlayout.h

src/widgets/configure.cmake

@@ -32,7 +32,7 @@ qt_feature("style-windows" PRIVATE
 )
 qt_feature("style-windowsvista" PRIVATE
     LABEL "WindowsVista"
-    CONDITION QT_FEATURE_style_windows AND QT_FEATURE_animation AND WIN32 AND NOT WINRT AND tests.uxtheme OR FIXME
+    CONDITION QT_FEATURE_style_windows AND QT_FEATURE_animation AND WIN32 AND NOT WINRT
 )
 qt_feature("style-android" PRIVATE
     LABEL "Android"

tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt

@@ -17,7 +17,7 @@ add_qt_test(tst_qmimedatabase-cache
 )
 
 # Resources:
-set_source_files_properties("/devel/qt5/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
+set_source_files_properties("/devel/work/qt-cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
     PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
 )
 set(mimetypes_resource_files
@@ -28,7 +28,7 @@ add_qt_resource(tst_qmimedatabase-cache "mimetypes"
     PREFIX
         "/qt-project.org/qmime/packages"
     BASE
-        "/devel/qt5/qtbase/src/corelib/mimetypes"
+        "/devel/work/qt-cmake/qtbase/src/corelib/mimetypes"
     FILES
         ${mimetypes_resource_files}
 )

tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt

@@ -17,7 +17,7 @@ add_qt_test(tst_qmimedatabase-xml
 )
 
 # Resources:
-set_source_files_properties("/devel/qt5/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
+set_source_files_properties("/devel/work/qt-cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
     PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
 )
 set(mimetypes_resource_files
@@ -28,7 +28,7 @@ add_qt_resource(tst_qmimedatabase-xml "mimetypes"
     PREFIX
         "/qt-project.org/qmime/packages"
     BASE
-        "/devel/qt5/qtbase/src/corelib/mimetypes"
+        "/devel/work/qt-cmake/qtbase/src/corelib/mimetypes"
     FILES
         ${mimetypes_resource_files}
 )

tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt

@@ -0,0 +1,35 @@
+# Generated from qdatastream.pro.
+
+#####################################################################
+## tst_qdatastream Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "datastream.q42")
+
+add_qt_test(tst_qdatastream
+    SOURCES
+        tst_qdatastream.cpp
+    DEFINES
+        -QT_NO_LINKED_LIST
+    PUBLIC_LIBRARIES
+        Qt::Gui
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # Resources:
+    set(testdata_resource_files
+        "datastream.q42"
+    )
+
+    add_qt_resource(tst_qdatastream "testdata"
+        PREFIX
+            "/"
+        FILES
+            ${testdata_resource_files}
+    )
+endif()

tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt

@@ -6,7 +6,6 @@
 
 add_qt_test(tst_qdbusabstractinterface
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
-    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../interface.cpp ../interface.h
         ../tst_qdbusabstractinterface.cpp

tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt

@@ -6,7 +6,6 @@
 
 add_qt_test(tst_qdbusmarshall
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
-    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         ../tst_qdbusmarshall.cpp
     LIBRARIES

tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt

@@ -12,4 +12,5 @@ add_qt_test(tst_qopenglwindow
         Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::OpenGL
 )

tests/auto/gui/text/qfontdatabase/CMakeLists.txt

@@ -28,10 +28,14 @@ set_source_files_properties("../../../shared/resources/testfont_condensed.ttf"
 set_source_files_properties("../../../shared/resources/testfont_italic.ttf"
     PROPERTIES QT_RESOURCE_ALIAS "testfont_italic.ttf"
 )
+set_source_files_properties("../../../shared/resources/testfont_open.otf"
+    PROPERTIES QT_RESOURCE_ALIAS "testfont_open.otf"
+)
 set(testdata_resource_files
     "../../../shared/resources/testfont.ttf"
     "../../../shared/resources/testfont_condensed.ttf"
     "../../../shared/resources/testfont_italic.ttf"
+    "../../../shared/resources/testfont_open.otf"
     "LED_REAL.TTF"
 )
 

tests/auto/network/ssl/qsslcertificate/CMakeLists.txt

@@ -4,6 +4,13 @@
 ## tst_qsslcertificate Test:
 #####################################################################
 
+# special case begin
+# This test requires private tests to properly build
+if (NOT QT_FEATURE_private_tests)
+    return()
+endif()
+# special case end
+
 # Collect test data
 file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}

tests/auto/opengl/CMakeLists.txt

@@ -1,6 +1 @@
 # Generated from opengl.pro.
-
-add_subdirectory(qgl)
-add_subdirectory(qglbuffer)
-add_subdirectory(qglfunctions)
-add_subdirectory(qglthreads)

tests/auto/opengl/qgl/CMakeLists.txt

@@ -1,42 +0,0 @@
-# Generated from qgl.pro.
-
-if(NOT TARGET Qt::OpenGL)
-    return()
-endif()
-
-#####################################################################
-## tst_qgl Test:
-#####################################################################
-
-add_qt_test(tst_qgl
-    SOURCES
-        tst_qgl.cpp
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::OpenGLPrivate
-        Qt::WidgetsPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::OpenGL
-        Qt::Widgets
-)
-
-# Resources:
-set_source_files_properties("../../gui/image/qpixmap/images/designer.png"
-    PROPERTIES QT_RESOURCE_ALIAS "designer.png"
-)
-set(qgl_resource_files
-    "../../gui/image/qpixmap/images/designer.png"
-)
-
-add_qt_resource(tst_qgl "qgl"
-    PREFIX
-        "/"
-    FILES
-        ${qgl_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:qgl.pro:<TRUE>:
-# _REQUIREMENTS = "qtHaveModule(opengl)"

tests/auto/opengl/qglbuffer/CMakeLists.txt

@@ -1,21 +0,0 @@
-# Generated from qglbuffer.pro.
-
-if(NOT TARGET Qt::OpenGL)
-    return()
-endif()
-
-#####################################################################
-## tst_qglbuffer Test:
-#####################################################################
-
-add_qt_test(tst_qglbuffer
-    SOURCES
-        tst_qglbuffer.cpp
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::OpenGL
-        Qt::Widgets
-)
-
-#### Keys ignored in scope 1:.:.:qglbuffer.pro:<TRUE>:
-# _REQUIREMENTS = "qtHaveModule(opengl)"

tests/auto/opengl/qglfunctions/CMakeLists.txt

@@ -1,21 +0,0 @@
-# Generated from qglfunctions.pro.
-
-if(NOT TARGET Qt::OpenGL)
-    return()
-endif()
-
-#####################################################################
-## tst_qglfunctions Test:
-#####################################################################
-
-add_qt_test(tst_qglfunctions
-    SOURCES
-        tst_qglfunctions.cpp
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::OpenGL
-        Qt::Widgets
-)
-
-#### Keys ignored in scope 1:.:.:qglfunctions.pro:<TRUE>:
-# _REQUIREMENTS = "qtHaveModule(opengl)"

tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt

@@ -22,3 +22,11 @@ add_qt_test(tst_qgraphicsview
 
 #### Keys ignored in scope 1:.:.:qgraphicsview.pro:<TRUE>:
 # testcase.timeout = "500"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qgraphicsview CONDITION QT_FEATURE_opengl
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+)

tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt

@@ -12,5 +12,6 @@ add_qt_test(tst_qopenglwidget
         Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::OpenGL
         Qt::Widgets
 )

tests/manual/CMakeLists.txt

@@ -9,13 +9,17 @@ endif()
 
 add_subdirectory(bearerex)
 add_subdirectory(filetest)
-add_subdirectory(embeddedintoforeignwindow)
+# special case begin
-add_subdirectory(foreignwindows)
+# diaglib is broken in dev due to missing
+# QtOpenGL/QGLFunctions headers
+# add_subdirectory(embeddedintoforeignwindow)
+# add_subdirectory(foreignwindows)
+# special case end
 add_subdirectory(gestures)
 add_subdirectory(highdpi)
 add_subdirectory(inputmethodhints)
 add_subdirectory(keypadnavigation)
-add_subdirectory(lance)
+#add_subdirectory(lance) # special case qgl.h missing
 add_subdirectory(qcursor)
 add_subdirectory(qdesktopservices)
 add_subdirectory(qdesktopwidget)

tests/manual/qtabletevent/CMakeLists.txt

@@ -1,5 +1,5 @@
 # Generated from qtabletevent.pro.
 
-add_subdirectory(device_information)
+#add_subdirectory(device_information) # special case no member named 'staticQtMetaObject'
 add_subdirectory(event_compression)
 add_subdirectory(regular_widgets)