diff options
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 6 | ||||
| -rw-r--r-- | src/tools/ifcodegen/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/tools/ifcodegen/generator/global_functions.py | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/.cmake.conf b/.cmake.conf index be788d10..846c4f3b 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.11.0") +set(QT_REPO_MODULE_VERSION "6.12.0") diff --git a/dependencies.yaml b/dependencies.yaml index a9705abd..687b98b0 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../qtdeclarative: - ref: fc162d455eedbb68f22f302dee45f7faf4146dd0 + ref: 68e5d7bf7de7a35f7319be67a3db954752ebb161 required: true ../qtremoteobjects: - ref: dd440af28ba657ca7c073f17db91611cb9cd3d57 + ref: bcd7287b8c72c8ae4323da9e6a5b6e4d4617f0f1 required: true ../qttools: - ref: b7f8536d4079c85c4536f1d16759f2a4845600b9 + ref: 5d3150b960e0791048b571dc4ed9cbf9f0624b2b required: false diff --git a/src/tools/ifcodegen/CMakeLists.txt b/src/tools/ifcodegen/CMakeLists.txt index c86393aa..00f629e6 100644 --- a/src/tools/ifcodegen/CMakeLists.txt +++ b/src/tools/ifcodegen/CMakeLists.txt @@ -209,7 +209,12 @@ endif() file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/.config "QT_DISABLE_DEPRECATED_UP_TO: \"${QT_DISABLE_DEPRECATED_UP_TO}\"\n") if(NOT DEFINED QT_WARN_DEPRECATED_UP_TO) - set(QT_WARN_DEPRECATED_UP_TO ${QT_REPO_MODULE_VERSION} CACHE STRING "Warn for using deprecated up to this Qt version.") + if(${QT_REPO_MODULE_VERSION} MATCHES "([0-9]+)\.([0-9]+)\.([0-9]+)") + math(EXPR REPO_VERSION_HEX "(${CMAKE_MATCH_1} << 16) + (${CMAKE_MATCH_2} << 8) + ${CMAKE_MATCH_3}" OUTPUT_FORMAT HEXADECIMAL) + else() + set(REPO_VERSION_HEX "0x060000") + endif() + set(QT_WARN_DEPRECATED_UP_TO ${REPO_VERSION_HEX} CACHE STRING "Warn for using deprecated up to this Qt version.") endif() file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/.config "QT_WARN_DEPRECATED_UP_TO: \"${QT_WARN_DEPRECATED_UP_TO}\"\n") diff --git a/src/tools/ifcodegen/generator/global_functions.py b/src/tools/ifcodegen/generator/global_functions.py index d65e94e5..4eaa1732 100644 --- a/src/tools/ifcodegen/generator/global_functions.py +++ b/src/tools/ifcodegen/generator/global_functions.py @@ -67,6 +67,8 @@ def deprecate_helper(version, removal, message): """ def version_to_int(version_string): + if version_string.find('.') == -1: + return int(version_string, 0) version_val = 0 i = 0 for ver in version_string.split('.'): |