[qt] 6.6.3

VITObelgium · May 6, 2024 · 476a9ee · 476a9ee
1 parent b69ad11
commit 476a9ee
Show file tree

Hide file tree

Showing 60 changed files with 1,061 additions and 725 deletions.
diff --git a/ports/qt/portfile.cmake b/ports/qt/portfile.cmake
@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json
@@ -0,0 +1,214 @@
+{
+  "name": "qt",
+  "version": "6.6.3",
+  "description": "A cross-platform application and UI framework.",
+  "homepage": "https://www.qt.io/",
+  "license": null,
+  "dependencies": [
+    {
+      "name": "qt3d",
+      "default-features": false,
+      "features": [
+        "animation",
+        "assimp",
+        "extras",
+        "input",
+        "logic",
+        "qml",
+        "render",
+        "rhi"
+      ]
+    },
+    {
+      "name": "qt5compat",
+      "default-features": false,
+      "features": [
+        "big-codecs",
+        "codecs",
+        "qml",
+        "textcodec"
+      ]
+    },
+    "qtapplicationmanager",
+    {
+      "name": "qtbase",
+      "default-features": false
+    },
+    {
+      "name": "qtcharts",
+      "default-features": false,
+      "features": [
+        "designer",
+        "qml"
+      ]
+    },
+    "qtcoap",
+    "qtconnectivity",
+    "qtdatavis3d",
+    "qtdeclarative",
+    {
+      "name": "qtdeviceutilities",
+      "default-features": false,
+      "platform": "linux"
+    },
+    "qtdoc",
+    "qtgraphs",
+    "qtgrpc",
+    {
+      "name": "qtimageformats",
+      "default-features": false,
+      "features": [
+        "jasper",
+        "tiff",
+        "webp"
+      ]
+    },
+    "qtinterfaceframework",
+    "qtlanguageserver",
+    {
+      "name": "qtlottie",
+      "default-features": false,
+      "features": [
+        "qml"
+      ]
+    },
+    "qtmqtt",
+    {
+      "name": "qtmultimedia",
+      "default-features": false,
+      "features": [
+        "ffmpeg",
+        "qml",
+        "widgets"
+      ]
+    },
+    {
+      "name": "qtmultimedia",
+      "default-features": false,
+      "features": [
+        "gstreamer"
+      ],
+      "platform": "!windows"
+    },
+    "qtnetworkauth",
+    {
+      "name": "qtopcua",
+      "features": [
+        "qml"
+      ]
+    },
+    {
+      "name": "qtpositioning",
+      "default-features": false,
+      "features": [
+        "qml"
+      ]
+    },
+    {
+      "name": "qtquick3d",
+      "default-features": false
+    },
+    "qtquicktimeline",
+    {
+      "name": "qtremoteobjects",
+      "default-features": false,
+      "features": [
+        "qml"
+      ]
+    },
+    {
+      "name": "qtscxml",
+      "default-features": false,
+      "features": [
+        "qml"
+      ]
+    },
+    {
+      "name": "qtsensors",
+      "default-features": false,
+      "features": [
+        "qml"
+      ]
+    },
+    "qtserialbus",
+    "qtserialport",
+    "qtshadertools",
+    {
+      "name": "qtspeech",
+      "default-features": false,
+      "platform": "!(windows & x86)"
+    },
+    "qtsvg",
+    {
+      "name": "qttools",
+      "default-features": false,
+      "features": [
+        "assistant",
+        "designer",
+        "qml"
+      ]
+    },
+    "qttranslations",
+    "qtvirtualkeyboard",
+    {
+      "name": "qtwebchannel",
+      "default-features": false,
+      "features": [
+        "qml"
+      ]
+    },
+    {
+      "name": "qtwebengine",
+      "default-features": false,
+      "features": [
+        "geolocation",
+        "spellchecker",
+        "webchannel"
+      ],
+      "platform": "!static & !(windows & arm)"
+    },
+    {
+      "name": "qtwebsockets",
+      "default-features": false,
+      "features": [
+        "qml"
+      ]
+    },
+    {
+      "name": "qtwebview",
+      "default-features": false
+    },
+    {
+      "name": "qtwebview",
+      "default-features": false,
+      "features": [
+        "webengine"
+      ],
+      "platform": "!static & !(windows & arm)"
+    }
+  ],
+  "default-features": [
+    "default-features"
+  ],
+  "features": {
+    "default-features": {
+      "description": "Platform-dependent default features",
+      "dependencies": [
+        {
+          "name": "qtactiveqt",
+          "features": [
+            "qml"
+          ],
+          "platform": "windows"
+        },
+        {
+          "name": "qtwayland",
+          "features": [
+            "qml"
+          ],
+          "platform": "linux"
+        }
+      ]
+    }
+  }
+}
diff --git a/ports/qt3d/portfile.cmake b/ports/qt3d/portfile.cmake
@@ -0,0 +1,35 @@
+set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
+include("${SCRIPT_PATH}/qt_install_submodule.cmake")
+
+# General features:
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+FEATURES
+    "qml"           CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
+    "vulkan"        CMAKE_REQUIRE_FIND_PACKAGE_Vulkan
+    "vulkan"        FEATURE_qt3d_vulkan
+    "rhi"           FEATURE_qt3d_rhi_renderer
+    "render"        FEATURE_qt3d_render
+    "input"         FEATURE_qt3d_input
+    "logic"         FEATURE_qt3d_logic
+    "extras"        FEATURE_qt3d_extras
+    "animation"     FEATURE_qt3d_animation
+INVERTED_FEATURES
+    "qml"           CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
+    "vulkan"        CMAKE_DISABLE_FIND_PACKAGE_Vulkan
+    )
+
+if("assimp" IN_LIST FEATURES)
+    list(APPEND FEATURE_OPTIONS -DINPUT_assimp=system)
+else()
+    list(APPEND FEATURE_OPTIONS -DINPUT_assimp=no)
+endif()
+
+qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
+                     CONFIGURE_OPTIONS
+                        ${FEATURE_OPTIONS}
+                        #-DINPUT_fbxsdk=no
+                        -DFEATURE_qt3d_fbxsdk=OFF # OpenFBX? Probably not!
+                        -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON
+                     CONFIGURE_OPTIONS_RELEASE
+                     CONFIGURE_OPTIONS_DEBUG
+                    )
diff --git a/ports/qt3d/vcpkg.json b/ports/qt3d/vcpkg.json
@@ -0,0 +1,106 @@
+{
+  "name": "qt3d",
+  "version": "6.6.3",
+  "description": "Qt wrapper for existing OPC UA stacks",
+  "homepage": "https://www.qt.io/",
+  "license": null,
+  "dependencies": [
+    "assimp",
+    {
+      "name": "qtbase",
+      "default-features": false,
+      "features": [
+        "concurrent",
+        "gui",
+        "network",
+        "widgets"
+      ]
+    }
+  ],
+  "default-features": [
+    "animation",
+    "assimp",
+    "extras",
+    "input",
+    "logic",
+    "render"
+  ],
+  "features": {
+    "animation": {
+      "description": "Use the 3D Animation Aspect library",
+      "dependencies": [
+        {
+          "name": "qt3d",
+          "default-features": false,
+          "features": [
+            "render"
+          ]
+        }
+      ]
+    },
+    "assimp": {
+      "description": "Build with assimp",
+      "dependencies": [
+        "assimp"
+      ]
+    },
+    "extras": {
+      "description": "Use the 3D Extra library",
+      "dependencies": [
+        {
+          "name": "qt3d",
+          "default-features": false,
+          "features": [
+            "input",
+            "logic",
+            "render"
+          ]
+        }
+      ]
+    },
+    "input": {
+      "description": "Use the 3D Input Aspect library"
+    },
+    "logic": {
+      "description": "Use the 3D Logic Aspect library"
+    },
+    "qml": {
+      "description": "Build QML imports",
+      "dependencies": [
+        {
+          "name": "qtbase",
+          "default-features": false,
+          "features": [
+            "gui"
+          ]
+        },
+        {
+          "name": "qtdeclarative",
+          "default-features": false
+        }
+      ]
+    },
+    "render": {
+      "description": "Use the 3D Render Aspect library"
+    },
+    "rhi": {
+      "description": "Enable RHI renderer",
+      "dependencies": [
+        "qtshadertools"
+      ]
+    },
+    "vulkan": {
+      "description": "Build with vulkan support",
+      "dependencies": [
+        {
+          "name": "qt3d",
+          "default-features": false,
+          "features": [
+            "rhi"
+          ]
+        },
+        "vulkan"
+      ]
+    }
+  }
+}
diff --git a/ports/qtbase/allow_outside_prefix.patch b/ports/qtbase/allow_outside_prefix.patch
@@ -1,8 +1,8 @@
-diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
+diff --git a/cmake/QtBuildPathsHelpers.cmake b/cmake/QtBuildPathsHelpers.cmake
 index bd186c28b..2c1994d2e 100644
---- a/cmake/QtBuild.cmake
-+++ b/cmake/QtBuild.cmake
-@@ -28,11 +28,13 @@ function(qt_configure_process_path name default docstring)
+--- a/cmake/QtBuildPathsHelpers.cmake
++++ b/cmake/QtBuildPathsHelpers.cmake
+@@ -135,11 +135,13 @@ function(qt_configure_process_path name default docstring)
          elseif(rel_path MATCHES "^\.\./")
              # INSTALL_SYSCONFDIR is allowed to be outside the prefix.
              if(NOT name STREQUAL "INSTALL_SYSCONFDIR")

diff --git a/ports/qtbase/clang-cl_source_location.patch b/ports/qtbase/clang-cl_source_location.patch
@@ -3,12 +3,12 @@ index 823b2057b..4a8cd4fa8 100644
 --- a/src/corelib/kernel/qproperty.h
 +++ b/src/corelib/kernel/qproperty.h
 @@ -16,8 +16,8 @@
-
- #include <QtCore/qpropertyprivate.h>
-
--#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_QDOC)
-+#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_QDOC) && ( (defined(__cpp_consteval) && defined(_MSC_VER)) || !defined(_MSC_VER) )
+
+ #include <QtCore/qpropertyprivate.h>
+
+-#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_QDOC)
++#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_QDOC) && ( (defined(__cpp_consteval) && defined(_MSC_VER)) || !defined(_MSC_VER) )
  #include <source_location>
  #if defined(__cpp_lib_source_location)
- #define QT_SOURCE_LOCATION_NAMESPACE std
- #define QT_PROPERTY_COLLECT_BINDING_LOCATION
+ #define QT_SOURCE_LOCATION_NAMESPACE std
+ #define QT_PROPERTY_COLLECT_BINDING_LOCATION