diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-26 10:35:52 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-29 16:58:04 +0200 |
| commit | fa12e9c1c3634696cf3e0754ab9c374456945efc (patch) | |
| tree | 7729c6d1990dc2d9f4746c45e7fcae96d41a0128 /src/core/api | |
| parent | 9d962bc9424c71a451d04741619c9597f3da8010 (diff) | |
| parent | d044140246734b8851689f55197c03cfd29dec99 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I7094e85a7770303a2ae30baccbc484c04f33600e
Diffstat (limited to 'src/core/api')
| -rw-r--r-- | src/core/api/qtbug-61521.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp index 86d5998ef..002a1af22 100644 --- a/src/core/api/qtbug-61521.cpp +++ b/src/core/api/qtbug-61521.cpp @@ -5,7 +5,6 @@ ** ** This file is part of the QtWebEngine module of the Qt Toolkit. ** -** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in @@ -100,7 +99,7 @@ SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) { } SHIM_HIDDEN void ShimCFree(void* ptr) { - cfree(ptr); + free(ptr); } SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) { |