diff options
| -rw-r--r-- | cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 | ||||
| -rw-r--r-- | configure.cmake | 9 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/entrypoint/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/gui/util/qktxhandler.cpp | 4 |
5 files changed, 12 insertions, 6 deletions
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 0afd9e7299..ddf86230bb 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -369,7 +369,7 @@ macro(qt_build_repo_end) qt_path_join(__qt_repo_install_dir ${QT_CONFIG_INSTALL_DIR} ${INSTALL_CMAKE_NAMESPACE}) if(NOT PROJECT_NAME STREQUAL "QtBase") - if (EXISTS cmake) + if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/cmake") qt_copy_or_install(DIRECTORY cmake/ DESTINATION "${__qt_repo_install_dir}" FILES_MATCHING PATTERN "Find*.cmake" diff --git a/configure.cmake b/configure.cmake index 858f580a0e..26e887c559 100644 --- a/configure.cmake +++ b/configure.cmake @@ -1,5 +1,3 @@ - - #### Inputs @@ -1090,6 +1088,13 @@ qt_configure_add_report_entry( MESSAGE "Command line option -sanitize fuzzer-no-link is only supported with clang compilers." CONDITION QT_FEATURE_sanitize_fuzzer_no_link AND NOT CLANG ) +# special case begin +qt_configure_add_report_entry( + TYPE ERROR + MESSAGE "Setting a library infix is not supported for framework builds." + CONDITION QT_FEATURE_framework AND DEFINED QT_LIBINFIX +) +# special case end qt_extra_definition("QT_VERSION_STR" "\"${PROJECT_VERSION}\"" PUBLIC) qt_extra_definition("QT_VERSION_MAJOR" ${PROJECT_VERSION_MAJOR} PUBLIC) diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt index 37e07f2350..5e97a19751 100644 --- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt +++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt @@ -65,6 +65,7 @@ qt_internal_add_3rdparty_library(BundledHarfbuzz ) qt_disable_warnings(BundledHarfbuzz) qt_set_symbol_visibility_hidden(BundledHarfbuzz) +qt_set_msvc_cplusplus_options(BundledHarfbuzz PRIVATE) #### Keys ignored in scope 1:.:.:harfbuzz-ng.pro:<TRUE>: # OTHER_FILES = "$$PWD/src/harfbuzz.cc" diff --git a/src/entrypoint/CMakeLists.txt b/src/entrypoint/CMakeLists.txt index 801691b4e5..5242337ee4 100644 --- a/src/entrypoint/CMakeLists.txt +++ b/src/entrypoint/CMakeLists.txt @@ -94,7 +94,7 @@ if(using_entrypoint_library) set_target_properties(EntryPoint PROPERTIES INTERFACE_QT_MODULE_PRI_EXTRA_CONTENT " QT.entrypoint_implementation.name = QtEntryPointImplementation -QT.entrypoint_implementation.module = Qt6EntryPoint +QT.entrypoint_implementation.module = Qt6EntryPoint${QT_LIBINFIX} QT.entrypoint_implementation.ldflags = ${entrypoint_implementation_ldflags} QT.entrypoint_implementation.libs = $$QT_MODULE_LIB_BASE QT.entrypoint_implementation.module_config = staticlib v2 internal_module diff --git a/src/gui/util/qktxhandler.cpp b/src/gui/util/qktxhandler.cpp index cd8ca3635e..9f4545f3af 100644 --- a/src/gui/util/qktxhandler.cpp +++ b/src/gui/util/qktxhandler.cpp @@ -148,7 +148,7 @@ QTextureFileData QKtxHandler::read() texData.setNumFaces(decode(header->numberOfFaces)); const quint32 bytesOfKeyValueData = decode(header->bytesOfKeyValueData); - if (headerSize + bytesOfKeyValueData < buf.length()) // oob check + if (headerSize + bytesOfKeyValueData < quint64(buf.length())) // oob check texData.setKeyValueMetadata( decodeKeyValues(QByteArrayView(buf.data() + headerSize, bytesOfKeyValueData))); quint32 offset = headerSize + bytesOfKeyValueData; @@ -227,7 +227,7 @@ QMap<QByteArray, QByteArray> QKtxHandler::decodeKeyValues(QByteArrayView view) c decode(qFromUnaligned<quint32>(view.constData() + offset)); offset += sizeof(quint32); - if (offset + keyAndValueByteSize > view.size()) + if (offset + keyAndValueByteSize > quint64(view.size())) break; // oob read // 'key' is a UTF-8 string ending with a null terminator, 'value' is the rest. |