whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1683731304

bb10
Qt CI Bot 2023-05-11 07:23:05 +00:00
parent d3ede38edd 86a0e70d65
commit 9da69c7969
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mkspecs/features/qt.prf
View File

@ -252,15 +252,16 @@ for(ever) {
} else {
lib_bases = $$MODULE_MODULE$$qtPlatformTargetSuffix()
darwin: lib_bases *= $$MODULE_MODULE
add_lib_to_pretargetdeps = false
win32|contains(MODULE_CONFIG, staticlib) {
lib_prefix = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB
lib_suffixes = $$QMAKE_EXTENSION_STATICLIB
lib_suffixes *= $$QMAKE_LIB_EXTENSIONS
add_lib_to_pretargetdeps = true
!xcodebuild: \
add_lib_to_pretargetdeps = true
} else {
lib_prefix = $$MODULE_LIBS/$$QMAKE_PREFIX_SHLIB
lib_suffixes = $$QMAKE_EXTENSION_SHLIB
add_lib_to_pretargetdeps = false
}
candidates =
for(lib_base, lib_bases) {

3
src/gui/painting/qdatabuffer_p.h
View File

@ -89,13 +89,16 @@ public:
}
void shrink(qsizetype size) {
Q_ASSERT(capacity >= size);
capacity = size;
if (size) {
buffer = (Type*) realloc(static_cast<void*>(buffer), capacity * sizeof(Type));
Q_CHECK_PTR(buffer);
siz = std::min(siz, size);
} else {
free(buffer);
buffer = nullptr;
siz = 0;
}
}